From: Giridhar Malavali Date: Wed, 22 Aug 2012 18:21:07 +0000 (-0400) Subject: [SCSI] qla2xxx: Don't register to legacy interrupt for ISP82xx. X-Git-Tag: firefly_0821_release~3680^2~1940^2^2~102 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a033b65532542292f180a439ffc3a17b5d60ae30;p=firefly-linux-kernel-4.4.55.git [SCSI] qla2xxx: Don't register to legacy interrupt for ISP82xx. Signed-off-by: Giridhar Malavali Signed-off-by: Chad Dupuis Signed-off-by: James Bottomley --- 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,