Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6225da48 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

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: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ae95757a

drivers/block/cciss.c

+2 −2
Original line number Diff line number Diff line
@@ -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);