diff options
| author | Mike Miller <mike.miller@hp.com> | 2006-12-06 20:35:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 08:39:30 -0800 |
| commit | 1ecb9c0f3c9ef6af77c39a9f584940691847ccf4 (patch) | |
| tree | c65c2e0315e04de6d57b8eb75a19b79cfdf1c072 /drivers/block | |
| parent | 799202cbd0ef6a201446d99fcbd78b9f0bda6ae5 (diff) | |
| download | op-kernel-dev-1ecb9c0f3c9ef6af77c39a9f584940691847ccf4.zip op-kernel-dev-1ecb9c0f3c9ef6af77c39a9f584940691847ccf4.tar.gz | |
[PATCH] cciss: cleanup cciss_interrupt mode
A pretty simple cleanup for cciss_interrupt_mode.
Signed-off-by: Mike Miller <mike.miller@hp.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cciss.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index c99cb7e..892e092 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -2788,23 +2788,21 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *c, if (err > 0) { printk(KERN_WARNING "cciss: only %d MSI-X vectors " "available\n", err); + goto default_int_mode; } else { printk(KERN_WARNING "cciss: MSI-X init failed %d\n", err); + goto default_int_mode; } } if (pci_find_capability(pdev, PCI_CAP_ID_MSI)) { if (!pci_enable_msi(pdev)) { - c->intr[SIMPLE_MODE_INT] = pdev->irq; c->msi_vector = 1; - return; } else { printk(KERN_WARNING "cciss: MSI init failed\n"); - c->intr[SIMPLE_MODE_INT] = pdev->irq; - return; } } - default_int_mode: +default_int_mode: #endif /* CONFIG_PCI_MSI */ /* if we get here we're going to use the default interrupt mode */ c->intr[SIMPLE_MODE_INT] = pdev->irq; |
