aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla4xxx/ql4_os.c
diff options
context:
space:
mode:
authorVikas Chaudhary <vikas.chaudhary@qlogic.com>2011-05-18 02:17:08 -0400
committerJames Bottomley <jbottomley@parallels.com>2011-05-24 12:39:52 -0400
commit977f46a4bb58e2a8f4d287db311084e24c502b77 (patch)
tree03b4033bfab39fd0e2b1b37f1883ad761f6d5c96 /drivers/scsi/qla4xxx/ql4_os.c
parent0160ef12693cf1614f602051474792c5b71c639f (diff)
[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>
Diffstat (limited to 'drivers/scsi/qla4xxx/ql4_os.c')
-rw-r--r--drivers/scsi/qla4xxx/ql4_os.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index b657ecec46fa..302938ed2015 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -735,7 +735,7 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha)
735 /* don't poll if reset is going on */ 735 /* don't poll if reset is going on */
736 if (!(test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags) || 736 if (!(test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags) ||
737 test_bit(DPC_RESET_HA, &ha->dpc_flags) || 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 if (dev_state == QLA82XX_DEV_NEED_RESET && 739 if (dev_state == QLA82XX_DEV_NEED_RESET &&
740 !test_bit(DPC_RESET_HA, &ha->dpc_flags)) { 740 !test_bit(DPC_RESET_HA, &ha->dpc_flags)) {
741 if (!ql4xdontresethba) { 741 if (!ql4xdontresethba) {