From: Stefan Richter Date: Sat, 6 Dec 2008 16:35:20 +0000 (+0100) Subject: ieee1394: ohci1394: pass error codes from request_irq through X-Git-Tag: v2.6.29-rc1~187^2~15 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9e234faf98ec4fbcc3292d767df2c709a032cba5;p=linux-2.6-omap-h63xx.git ieee1394: ohci1394: pass error codes from request_irq through Signed-off-by: Stefan Richter --- diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 066726bcb0e..d077fe6d0ce 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, * we need to get to that "no event", so enough should be initialized * by that point. */ - if (request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED, - OHCI1394_DRIVER_NAME, ohci)) { + err = request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED, + OHCI1394_DRIVER_NAME, ohci); + if (err) { PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq); goto err; } @@ -3423,10 +3424,11 @@ static int ohci1394_pci_resume(struct pci_dev *dev) reg_write(ohci, OHCI1394_IntMaskClear, 0xffffffff); mdelay(50); - if (request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED, - OHCI1394_DRIVER_NAME, ohci)) { + err = request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED, + OHCI1394_DRIVER_NAME, ohci); + if (err) { PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq); - return -EIO; + return err; } ohci_initialize(ohci);