From aa905c708f54d5de0c77729dfb971b5e0f13c4f1 Mon Sep 17 00:00:00 2001 From: Lalit Chandivade Date: Thu, 2 Dec 2010 22:12:45 -0800 Subject: [PATCH] --- yaml --- r: 226819 b: refs/heads/master c: d56a1f7b39631806ee3d49445a65da6288b099b4 h: refs/heads/master i: 226817: efa866449605d219501c938694174d32dfe872d4 226815: 33187837973f28183a39e0a4b9b85cd8f6825447 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_os.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 61a39b14984d..8a915236612d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e128271b7bcb9c8955cadbf2e18f8af288979e6b +refs/heads/master: d56a1f7b39631806ee3d49445a65da6288b099b4 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_os.c b/trunk/drivers/scsi/qla4xxx/ql4_os.c index fa5ddadf4869..a1ba085565af 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_os.c +++ b/trunk/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",