diff options
| author | Mike Miller <mike.miller@hp.com> | 2010-06-11 13:13:14 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 18:15:21 +0200 |
| commit | 256aea3fd3b5c43e8d05ce66eaf43def83773612 (patch) | |
| tree | 40d14e55b8e1410bda9f566b77c30d0a923dc8f3 /drivers/block/cciss.c | |
| parent | 956bcb7c1a9a73c6d5db66e83f32c785d06dc8fc (diff) | |
| download | linux-3.10-256aea3fd3b5c43e8d05ce66eaf43def83773612.tar.gz linux-3.10-256aea3fd3b5c43e8d05ce66eaf43def83773612.tar.bz2 linux-3.10-256aea3fd3b5c43e8d05ce66eaf43def83773612.zip | |
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/block/cciss.c')
| -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 5e215ff0a6b..4f59f03f91f 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, /* 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; } } |