aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/ohci1394.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-12-06 11:35:20 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2009-01-04 17:50:33 -0500
commit9e234faf98ec4fbcc3292d767df2c709a032cba5 (patch)
tree0353d8cdff57ab8b8da7f6362536b3bf9df9528a /drivers/ieee1394/ohci1394.c
parentd1069aea6840c24f6e0617a758334312b60d3fc6 (diff)
ieee1394: ohci1394: pass error codes from request_irq through
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/ohci1394.c')
-rw-r--r--drivers/ieee1394/ohci1394.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 066726bcb0ee..d077fe6d0ce5 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -3233,8 +3233,9 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
3233 * we need to get to that "no event", so enough should be initialized 3233 * we need to get to that "no event", so enough should be initialized
3234 * by that point. 3234 * by that point.
3235 */ 3235 */
3236 if (request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED, 3236 err = request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED,
3237 OHCI1394_DRIVER_NAME, ohci)) { 3237 OHCI1394_DRIVER_NAME, ohci);
3238 if (err) {
3238 PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq); 3239 PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq);
3239 goto err; 3240 goto err;
3240 } 3241 }
@@ -3423,10 +3424,11 @@ static int ohci1394_pci_resume(struct pci_dev *dev)
3423 reg_write(ohci, OHCI1394_IntMaskClear, 0xffffffff); 3424 reg_write(ohci, OHCI1394_IntMaskClear, 0xffffffff);
3424 mdelay(50); 3425 mdelay(50);
3425 3426
3426 if (request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED, 3427 err = request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED,
3427 OHCI1394_DRIVER_NAME, ohci)) { 3428 OHCI1394_DRIVER_NAME, ohci);
3429 if (err) {
3428 PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq); 3430 PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq);
3429 return -EIO; 3431 return err;
3430 } 3432 }
3431 3433
3432 ohci_initialize(ohci); 3434 ohci_initialize(ohci);