diff options
| author | Andrew Vasquez | 2008-02-28 23:06:09 +0100 |
|---|---|---|
| committer | James Bottomley | 2008-03-03 20:10:58 +0100 |
| commit | 7c7f1f299b7f21f1f5fd4fa3da6b626406109f30 (patch) | |
| tree | 4fd5a80a273a548b8b5b7001a28571df38fc4b50 | |
| parent | [SCSI] arcmsr: update version and changelog (diff) | |
| download | kernel-qcow2-linux-7c7f1f299b7f21f1f5fd4fa3da6b626406109f30.tar.gz kernel-qcow2-linux-7c7f1f299b7f21f1f5fd4fa3da6b626406109f30.tar.xz kernel-qcow2-linux-7c7f1f299b7f21f1f5fd4fa3da6b626406109f30.zip | |
[SCSI] qla2xxx: Correct needless clean-up resets during shutdown.
There's no point in hitting the RISC with what will most
assuredly be an unsucessful reset of the RISC hardware if the
initial stop-firmware mailbox command fails with a time-out
status. Instead, to avoid what could amount to a lengthy
stop-firmware/detect-failure/reset-risc loop, continue with
driver unloading and discard the stop-firmware requirement.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index d5c7853e7eba..4897663f3c2b 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -4022,7 +4022,8 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *ha) return; ret = qla2x00_stop_firmware(ha); - for (retries = 5; ret != QLA_SUCCESS && retries ; retries--) { + for (retries = 5; ret != QLA_SUCCESS && ret != QLA_FUNCTION_TIMEOUT && + retries ; retries--) { qla2x00_reset_chip(ha); if (qla2x00_chip_diag(ha) != QLA_SUCCESS) continue; |