[SCSI] qla2xxx: Stop unconditional completion of mailbox commands issued in interrupt...

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>

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 94bded5ddce4fe2f958dcdb8387c471eeaf790cf..d2005c3c82479b29668670d9dbe58a02d37ddb17 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -4075,7 +4075,10 @@ qla82xx_chip_reset_cleanup(scsi_qla_host_t *vha)
                                ha->flags.isp82xx_fw_hung = 1;
                                if (ha->flags.mbox_busy) {
                                        ha->flags.mbox_int = 1;
-                                       complete(&ha->mbx_intr_comp);
+                                       if (test_bit(MBX_INTR_WAIT,
+                                           &ha->mbx_cmd_flags)) {
+                                               complete(&ha->mbx_intr_comp);
+                                       }
                                }
                                break;
                        }

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 01c87004b219a8225e2fe86507487fd8a2825ae4..abec1dd31194ea919c39bd5d20fd4b6d231823a4 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -4014,7 +4014,10 @@ qla2xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
                                ql_dbg(ql_dbg_aer, vha, 0x9001,
                                    "Due to pci channel io frozen, doing premature "
                                    "completion of mbx command.\n");
-                               complete(&ha->mbx_intr_comp);
+                               if (test_bit(MBX_INTR_WAIT,
+                                   &ha->mbx_cmd_flags)) {
+                                       complete(&ha->mbx_intr_comp);
+                               }
                        }
                }
                qla2x00_free_irqs(vha);