diff options
| author |   Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-11-28 10:15:20 -0600 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2011-12-15 10:57:30 +0400 |
| commit | 45bcf018d1a4779d592764ef57517c92589d55d7 (patch) | |
| tree | 8dbb7adf177fcc30f5a2c628bf56e9fc39bc8834 /drivers/scsi/hpsa.c | |
| parent | [SCSI] mptsas: Add device ID for SAS1068_820XELP. (diff) | |
| download | linux-dev-45bcf018d1a4779d592764ef57517c92589d55d7.tar.xz linux-dev-45bcf018d1a4779d592764ef57517c92589d55d7.zip | |
[SCSI] hpsa: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
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>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -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 865d452542be..594ce8316727 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); |