diff options
author | Mike Miller <mike.miller@hp.com> | 2010-06-11 07:13:14 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 12:15:21 -0400 |
commit | 256aea3fd3b5c43e8d05ce66eaf43def83773612 (patch) | |
tree | 40d14e55b8e1410bda9f566b77c30d0a923dc8f3 /drivers | |
parent | 956bcb7c1a9a73c6d5db66e83f32c785d06dc8fc (diff) |
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: Mike Miller <mike.miller@hp.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/cciss.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 5e215ff0a6bb..4f59f03f91ff 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -4483,18 +4483,18 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, | |||
4483 | /* make sure the board interrupts are off */ | 4483 | /* make sure the board interrupts are off */ |
4484 | hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF); | 4484 | hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF); |
4485 | if (hba[i]->msi_vector || hba[i]->msix_vector) { | 4485 | if (hba[i]->msi_vector || hba[i]->msix_vector) { |
4486 | if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], | 4486 | if (request_irq(hba[i]->intr[PERF_MODE_INT], |
4487 | do_cciss_msix_intr, | 4487 | do_cciss_msix_intr, |
4488 | IRQF_DISABLED, hba[i]->devname, hba[i])) { | 4488 | IRQF_DISABLED, hba[i]->devname, hba[i])) { |
4489 | printk(KERN_ERR "cciss: Unable to get irq %d for %s\n", | 4489 | printk(KERN_ERR "cciss: Unable to get irq %d for %s\n", |
4490 | hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); | 4490 | hba[i]->intr[PERF_MODE_INT], hba[i]->devname); |
4491 | goto clean2; | 4491 | goto clean2; |
4492 | } | 4492 | } |
4493 | } else { | 4493 | } else { |
4494 | if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intx, | 4494 | if (request_irq(hba[i]->intr[PERF_MODE_INT], do_cciss_intx, |
4495 | IRQF_DISABLED, hba[i]->devname, hba[i])) { | 4495 | IRQF_DISABLED, hba[i]->devname, hba[i])) { |
4496 | printk(KERN_ERR "cciss: Unable to get irq %d for %s\n", | 4496 | printk(KERN_ERR "cciss: Unable to get irq %d for %s\n", |
4497 | hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); | 4497 | hba[i]->intr[PERF_MODE_INT], hba[i]->devname); |
4498 | goto clean2; | 4498 | goto clean2; |
4499 | } | 4499 | } |
4500 | } | 4500 | } |