[SCSI] qla2xxx: Don't fallback to interrupt-polling during re-initialization with MSI-X enabled.

ROMs in recent ISPs have MSI-X support, so it's no longer
necessary for the driver to fallback to interrupt polling during
ISP re-initialization.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index f03de8c79681..29bf8bc8731a 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -123,8 +123,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
 
         /* Wait for mbx cmd completion until timeout */
 
-        if (!abort_active && io_lock_on) {
-
+        if ((!abort_active && io_lock_on) || IS_NOPOLLING_TYPE(ha)) {
                 set_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);
 
                 if (IS_FWI2_CAPABLE(ha))
@@ -218,7 +217,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
         /* Clean up */
         ha->mcp = NULL;
 
-        if (abort_active || !io_lock_on) {
+        if ((abort_active || !io_lock_on) && !IS_NOPOLLING_TYPE(ha)) {
                 DEBUG11(printk("%s(%ld): checking for additional resp "
                     "interrupt.\n", __func__, base_vha->host_no));