From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Wed, 22 Aug 2012 18:21:07 +0000 (-0400)
Subject: [SCSI] qla2xxx: Don't register to legacy interrupt for ISP82xx.
X-Git-Tag: next-20120917~76^2^2~29
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f0f56a622260a08124bf3c412f95689b8739a305;p=karo-tx-linux.git

[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>
---

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 074b680ef938..f6415fec4761 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,