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

Commit 256aea3f authored by Mike Miller's avatar Mike Miller Committed by Jens Axboe
Browse files

cciss: make sure we request the performant mode irq 



Make sure we register the performant mode interrupt Another blunder.
Seemed to work because the call to put_controller_into_performant_mode was
never called.

Signed-off-by: default avatarMike Miller <mike.miller@hp.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 956bcb7c

drivers/block/cciss.c

+4 −4
Original line number Diff line number Diff line
@@ -4483,18 +4483,18 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, 
	/* make sure the board interrupts are off */

	hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);

	if (hba[i]->msi_vector || hba[i]->msix_vector) {

		if (request_irq(hba[i]->intr[SIMPLE_MODE_INT],

		if (request_irq(hba[i]->intr[PERF_MODE_INT],

				do_cciss_msix_intr,

				IRQF_DISABLED, hba[i]->devname, hba[i])) {

			printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",

			       hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname);

			       hba[i]->intr[PERF_MODE_INT], hba[i]->devname);

			goto clean2;

		}

	} else {

		if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intx,

		if (request_irq(hba[i]->intr[PERF_MODE_INT], do_cciss_intx,

				IRQF_DISABLED, hba[i]->devname, hba[i])) {

			printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",

			       hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname);

			       hba[i]->intr[PERF_MODE_INT], hba[i]->devname);

			goto clean2;

		}

	}