diff options
author | Chad Dupuis | 2011-11-18 18:02:17 +0100 |
---|---|---|
committer | James Bottomley | 2011-12-12 09:37:58 +0100 |
commit | c8f6544e6d831f05720687f3536d5cbc290ff181 (patch) | |
tree | face048ae4d833ebcc2e9629090f146533ce4d6c /drivers/scsi/qla2xxx/qla_os.c | |
parent | [SCSI] qla2xxx: Display IPE error message for ISP82xx. (diff) | |
download | kernel-qcow2-linux-c8f6544e6d831f05720687f3536d5cbc290ff181.tar.gz kernel-qcow2-linux-c8f6544e6d831f05720687f3536d5cbc290ff181.tar.xz kernel-qcow2-linux-c8f6544e6d831f05720687f3536d5cbc290ff181.zip |
[SCSI] qla2xxx: Encapsulate prematurely completing mailbox commands during ISP82xx firmware hang.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_os.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 71d62593c119..f9e5b85e84d8 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4009,16 +4009,8 @@ qla2xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state) /* For ISP82XX complete any pending mailbox cmd */ if (IS_QLA82XX(ha)) { ha->flags.isp82xx_fw_hung = 1; - if (ha->flags.mbox_busy) { - ha->flags.mbox_int = 1; - ql_dbg(ql_dbg_aer, vha, 0x9001, - "Due to pci channel io frozen, doing premature " - "completion of mbx command.\n"); - if (test_bit(MBX_INTR_WAIT, - &ha->mbx_cmd_flags)) { - complete(&ha->mbx_intr_comp); - } - } + ql_dbg(ql_dbg_aer, vha, 0x9001, "Pci channel io frozen\n"); + qla82xx_clear_pending_mbx(vha); } qla2x00_free_irqs(vha); pci_disable_device(pdev); |