35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
hpsa: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
|
||
|
|
|
||
|
|
From: Stephen M. Cameron <scameron@beardog.cce.hp.com>
|
||
|
|
|
||
|
|
IRQF_SHARED is required for older controllers that don't support MSI(X)
|
||
|
|
and which may end up sharing an interrupt. All the controllers hpsa
|
||
|
|
normally supports have MSI(X) capability, but older controllers may be
|
||
|
|
encountered via the hpsa_allow_any=1 module parameter.
|
||
|
|
|
||
|
|
Also remove deprecated IRQF_DISABLED.
|
||
|
|
|
||
|
|
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
|
||
|
|
---
|
||
|
|
drivers/scsi/hpsa.c | 4 ++--
|
||
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
RHBZ 754907
|
||
|
|
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
|
||
|
|
index 865d452..594ce83 100644
|
||
|
|
--- a/drivers/scsi/hpsa.c
|
||
|
|
+++ b/drivers/scsi/hpsa.c
|
||
|
|
@@ -4072,10 +4072,10 @@ static int hpsa_request_irq(struct ctlr_info *h,
|
||
|
|
|
||
|
|
if (h->msix_vector || h->msi_vector)
|
||
|
|
rc = request_irq(h->intr[h->intr_mode], msixhandler,
|
||
|
|
- IRQF_DISABLED, h->devname, h);
|
||
|
|
+ 0, h->devname, h);
|
||
|
|
else
|
||
|
|
rc = request_irq(h->intr[h->intr_mode], intxhandler,
|
||
|
|
- IRQF_DISABLED, h->devname, h);
|
||
|
|
+ IRQF_SHARED, h->devname, h);
|
||
|
|
if (rc) {
|
||
|
|
dev_err(&h->pdev->dev, "unable to get irq %d for %s\n",
|
||
|
|
h->intr[h->intr_mode], h->devname);
|