Commit 977f46a4bb58e2a8f4d287db311084e24c502b77
Committed by
James Bottomley
James Bottomley
1 parent
0160ef1269
Exists in
master
and in
39 other branches
[SCSI] qla4xxx: Don't check FW alive if ISP82XX reset is in progress
Corrected logic to don't check for F/W is alive if reset is already in progress for ISP82XX Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <jbottomley@parallels.com>
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
drivers/scsi/qla4xxx/ql4_os.c
| ... | ... | @@ -735,7 +735,7 @@ |
| 735 | 735 | /* don't poll if reset is going on */ |
| 736 | 736 | if (!(test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags) || |
| 737 | 737 | test_bit(DPC_RESET_HA, &ha->dpc_flags) || |
| 738 | - test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags))) { | |
| 738 | + test_bit(DPC_RETRY_RESET_HA, &ha->dpc_flags))) { | |
| 739 | 739 | if (dev_state == QLA82XX_DEV_NEED_RESET && |
| 740 | 740 | !test_bit(DPC_RESET_HA, &ha->dpc_flags)) { |
| 741 | 741 | if (!ql4xdontresethba) { |