summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGiridhar Malavali <giridhar.malavali@qlogic.com>2012-08-22 14:21:07 -0400
committerJames Bottomley <JBottomley@Parallels.com>2012-09-24 12:10:48 +0400
commita033b65532542292f180a439ffc3a17b5d60ae30 (patch)
tree8621324b7c229cb61e2bb292a66458bfd831f23e /drivers
parent8fcd6b8b0fbc61fb1af2960dcec8b23bd2211372 (diff)
downloadlinux-a033b65532542292f180a439ffc3a17b5d60ae30.tar.gz
linux-a033b65532542292f180a439ffc3a17b5d60ae30.tar.bz2
linux-a033b65532542292f180a439ffc3a17b5d60ae30.zip
[SCSI] qla2xxx: Don't register to legacy interrupt for ISP82xx.
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')
-rw-r--r--drivers/scsi/qla2xxx/qla_isr.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 2b05af1838f4..9997864b6b3c 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2913,6 +2913,11 @@ skip_msix:
} else
ql_log(ql_log_warn, vha, 0x0039,
"MSI-X; Falling back-to INTa mode -- %d.\n", ret);
+
+ /* Skip INTx on ISP82xx. */
+ if (!ha->flags.msi_enabled && IS_QLA82XX(ha))
+ return QLA_FUNCTION_FAILED;
+
skip_msi:
ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler,