From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Tue, 12 Jun 2012 14:56:33 +0000 (-0700)
Subject: qla2xxx: Don't register to legacy interrupt for ISP82xx.
X-Git-Tag: v2.6.39-400.9.0~449
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=23536cdbcc10f269fe76649ceba54f120b2d0b71;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Don't register to legacy interrupt for ISP82xx.

JIRA Key: V2632FC-210
---

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 876d017a009c..ddc5c51400f0 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2874,6 +2874,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,