diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-11-28 20:12:05 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2011-11-28 20:12:05 +0100 |
| commit | 6225da481597ebff09454c785fe0afc7f5fdbb77 (patch) | |
| tree | f32b8f2b558a0c1b4d7092cc28050ebdc2963dfc /drivers/block/cciss.c | |
| parent | loop: fix loop block driver discard and encryption comment (diff) | |
| download | linux-6225da481597ebff09454c785fe0afc7f5fdbb77.tar.xz linux-6225da481597ebff09454c785fe0afc7f5fdbb77.zip | |
cciss: 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.
Also remove deprecated IRQF_DISABLED.
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 8004ac30a7a8..6f22ed0dab65 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -4880,7 +4880,7 @@ static int cciss_request_irq(ctlr_info_t *h, { if (h->msix_vector || h->msi_vector) { if (!request_irq(h->intr[h->intr_mode], msixhandler, - IRQF_DISABLED, h->devname, h)) + 0, h->devname, h)) return 0; dev_err(&h->pdev->dev, "Unable to get msi irq %d" " for %s\n", h->intr[h->intr_mode], @@ -4889,7 +4889,7 @@ static int cciss_request_irq(ctlr_info_t *h, } if (!request_irq(h->intr[h->intr_mode], intxhandler, - IRQF_DISABLED, h->devname, h)) + IRQF_SHARED, h->devname, h)) return 0; dev_err(&h->pdev->dev, "Unable to get irq %d for %s\n", h->intr[h->intr_mode], h->devname); |