diff options
| author |   Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-11-28 10:15:20 -0600 |
|---|---|---|
| committer |   Ben Hutchings <ben@decadent.org.uk> | 2012-05-31 00:43:53 +0100 |
| commit | d2b6ee559fe72ec90da4eb623f3f01135c5a1ec7 (patch) | |
| tree | 717753550593eaf43780988a86620e45fb4821b3 | |
| parent | 4f00f9074ea5e11dc177a7c970a1846e9c1b7f72 (diff) | |
hpsa: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
commit 45bcf018d1a4779d592764ef57517c92589d55d7 upstream.
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>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/scsi/hpsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index dc9dea3a79b..b4d2c86a645 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -4068,10 +4068,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); |