2 files changed, 8 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 94bded5ddce4..d2005c3c8247 100644
--- 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 01c87004b219..abec1dd31194 100644
--- 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);