diff options
| author | Giridhar Malavali <giridhar.malavali@qlogic.com> | 2011-02-23 15:27:11 -0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-02-25 12:53:49 -0500 |
| commit | 862cd01e5c2f3f5cf1ca989aa1184d61b6988ba2 (patch) | |
| tree | 83271d26328e68f23c6edf24ca7937bcf25d74ca /drivers/scsi/qla2xxx/qla_mbx.c | |
| parent | 7190575f7a48c82fd99363748544023739dc4bb8 (diff) | |
| download | kernel_samsung_smdk4412-862cd01e5c2f3f5cf1ca989aa1184d61b6988ba2.tar.gz kernel_samsung_smdk4412-862cd01e5c2f3f5cf1ca989aa1184d61b6988ba2.tar.bz2 kernel_samsung_smdk4412-862cd01e5c2f3f5cf1ca989aa1184d61b6988ba2.zip | |
[SCSI] qla2xxx: Don't wait for active mailbox command completion when firmware is hung.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_mbx.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_mbx.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index a7f7346c783..b4a82b5f0f8 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -71,6 +71,13 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) return QLA_FUNCTION_TIMEOUT; } + if (ha->flags.isp82xx_fw_hung) { + /* Setting Link-Down error */ + mcp->mb[0] = MBS_LINK_DOWN_ERROR; + rval = QLA_FUNCTION_FAILED; + goto premature_exit; + } + /* * Wait for active mailbox commands to finish by waiting at most tov * seconds. This is to serialize actual issuing of mailbox cmds during @@ -83,13 +90,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) return QLA_FUNCTION_TIMEOUT; } - if (ha->flags.isp82xx_fw_hung) { - /* Setting Link-Down error */ - mcp->mb[0] = MBS_LINK_DOWN_ERROR; - rval = QLA_FUNCTION_FAILED; - goto premature_exit; - } - ha->flags.mbox_busy = 1; /* Save mailbox command for debug */ ha->mcp = mcp; |