diff options
| author | Lalit Chandivade <lalit.chandivade@qlogic.com> | 2010-12-03 01:12:45 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-12-21 13:24:42 -0500 |
| commit | d56a1f7b39631806ee3d49445a65da6288b099b4 (patch) | |
| tree | aeb9ae159cdb73828b2bc5feb70d60d50e2b6fdc /drivers/scsi | |
| parent | e128271b7bcb9c8955cadbf2e18f8af288979e6b (diff) | |
[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>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index fa5ddadf4869..a1ba085565af 100644 --- 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) | |||
| 706 | dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE); | 706 | dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE); |
| 707 | 707 | ||
| 708 | /* don't poll if reset is going on */ | 708 | /* don't poll if reset is going on */ |
| 709 | if (!test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags)) { | 709 | if (!(test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags) || |
| 710 | test_bit(DPC_RESET_HA, &ha->dpc_flags) || | ||
| 711 | test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags))) { | ||
| 710 | if (dev_state == QLA82XX_DEV_NEED_RESET && | 712 | if (dev_state == QLA82XX_DEV_NEED_RESET && |
| 711 | !test_bit(DPC_RESET_HA, &ha->dpc_flags)) { | 713 | !test_bit(DPC_RESET_HA, &ha->dpc_flags)) { |
| 712 | printk("scsi%ld: %s: HW State: NEED RESET!\n", | 714 | printk("scsi%ld: %s: HW State: NEED RESET!\n", |