diff options
author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-11-28 14:12:05 -0500 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2011-11-28 14:12:05 -0500 |
commit | 6225da481597ebff09454c785fe0afc7f5fdbb77 (patch) | |
tree | f32b8f2b558a0c1b4d7092cc28050ebdc2963dfc /drivers/block/cciss.c | |
parent | ae95757a9065d89be7c1ca613b53163dd30858b7 (diff) |
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, | |||
4880 | { | 4880 | { |
4881 | if (h->msix_vector || h->msi_vector) { | 4881 | if (h->msix_vector || h->msi_vector) { |
4882 | if (!request_irq(h->intr[h->intr_mode], msixhandler, | 4882 | if (!request_irq(h->intr[h->intr_mode], msixhandler, |
4883 | IRQF_DISABLED, h->devname, h)) | 4883 | 0, h->devname, h)) |
4884 | return 0; | 4884 | return 0; |
4885 | dev_err(&h->pdev->dev, "Unable to get msi irq %d" | 4885 | dev_err(&h->pdev->dev, "Unable to get msi irq %d" |
4886 | " for %s\n", h->intr[h->intr_mode], | 4886 | " for %s\n", h->intr[h->intr_mode], |
@@ -4889,7 +4889,7 @@ static int cciss_request_irq(ctlr_info_t *h, | |||
4889 | } | 4889 | } |
4890 | 4890 | ||
4891 | if (!request_irq(h->intr[h->intr_mode], intxhandler, | 4891 | if (!request_irq(h->intr[h->intr_mode], intxhandler, |
4892 | IRQF_DISABLED, h->devname, h)) | 4892 | IRQF_SHARED, h->devname, h)) |
4893 | return 0; | 4893 | return 0; |
4894 | dev_err(&h->pdev->dev, "Unable to get irq %d for %s\n", | 4894 | dev_err(&h->pdev->dev, "Unable to get irq %d for %s\n", |
4895 | h->intr[h->intr_mode], h->devname); | 4895 | h->intr[h->intr_mode], h->devname); |