[SCSI] qla4xxx: do not check for fw hung if reset retry is in progress

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Lalit Chandivade <lalit.chandivade@qlogic.com>
Signed-off-by: Ravi Anand <ravi.anand@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index fa5ddadf48693173fd9ab14526cef43c1904e1e5..a1ba085565af52c21350612ad14a6952ad4aa2ed 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -706,7 +706,9 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha)
        dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
 
        /* don't poll if reset is going on */
-       if (!test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags)) {
+       if (!(test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags) ||
+           test_bit(DPC_RESET_HA, &ha->dpc_flags) ||
+           test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags))) {
                if (dev_state == QLA82XX_DEV_NEED_RESET &&
                    !test_bit(DPC_RESET_HA, &ha->dpc_flags)) {
                        printk("scsi%ld: %s: HW State: NEED RESET!\n",