2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 7f6a89bd94f3..024c662ec34d 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -525,7 +525,7 @@ qla2x00_req_pkt(scsi_qla_host_t *ha)
 
                 /* Check for pending interrupts. */
                 /* During init we issue marker directly */
-                if (!ha->marker_needed)
+                if (!ha->marker_needed && !ha->flags.init_done)
                         qla2x00_poll(ha);
 
                 spin_lock_irq(&ha->hardware_lock);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index c53ec67c47f4..ccd662a6f5dc 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -252,7 +252,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *pvha, mbx_cmd_t *mcp)
         /* Clean up */
         ha->mcp = NULL;
 
-        if (!abort_active) {
+        if (abort_active || !io_lock_on) {
                 DEBUG11(printk("%s(%ld): checking for additional resp "
                     "interrupt.\n", __func__, ha->host_no));