diff options
| author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2011-11-18 09:02:15 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-12-12 12:36:02 +0400 |
| commit | 1806fcd5d3d7644511e57b1d0a397837b0b38623 (patch) | |
| tree | 6d3cce23d9dd09c61f7486e7c216e7721084fe00 /drivers/scsi | |
| parent | 3aadff356bb80dae1ebb0a2e68974fdbb39fe034 (diff) | |
| download | kernel-common-1806fcd5d3d7644511e57b1d0a397837b0b38623.tar.gz kernel-common-1806fcd5d3d7644511e57b1d0a397837b0b38623.tar.bz2 kernel-common-1806fcd5d3d7644511e57b1d0a397837b0b38623.zip | |
[SCSI] qla2xxx: Return the correct value for a mailbox command if 82xx is in reset recovery.
We need to return QLA_FUNCTION_TIMEOUT immediately otherwise we mess up the
mailbox command state machine.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_mbx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 3b3cec9f6ac2..f965a57f5d65 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -79,8 +79,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) mcp->mb[0] = MBS_LINK_DOWN_ERROR; ql_log(ql_log_warn, base_vha, 0x1004, "FW hung = %d.\n", ha->flags.isp82xx_fw_hung); - rval = QLA_FUNCTION_FAILED; - goto premature_exit; + return QLA_FUNCTION_TIMEOUT; } /* |