From 68d12a152ffae80d853c636e881d5b7841d70dba Mon Sep 17 00:00:00 2001 From: Giridhar Malavali Date: Wed, 22 Aug 2012 14:21:07 -0400 Subject: [PATCH] --- yaml --- r: 328840 b: refs/heads/master c: a033b65532542292f180a439ffc3a17b5d60ae30 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_isr.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 54456b0e3095..66876e85a8b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fcd6b8b0fbc61fb1af2960dcec8b23bd2211372 +refs/heads/master: a033b65532542292f180a439ffc3a17b5d60ae30 diff --git a/trunk/drivers/scsi/qla2xxx/qla_isr.c b/trunk/drivers/scsi/qla2xxx/qla_isr.c index 2b05af1838f4..9997864b6b3c 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_isr.c +++ b/trunk/drivers/scsi/qla2xxx/qla_isr.c @@ -2913,6 +2913,11 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp) } 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,