ieee1394: ohci1394: pass error codes from request_irq through

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2008-12-06 17:35:20 +01:00
Родитель d1069aea68
Коммит 9e234faf98
1 изменённых файлов: 7 добавлений и 5 удалений

Просмотреть файл

@ -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 * we need to get to that "no event", so enough should be initialized
* by that point. * by that point.
*/ */
if (request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED, err = request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED,
OHCI1394_DRIVER_NAME, ohci)) { OHCI1394_DRIVER_NAME, ohci);
if (err) {
PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq); PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq);
goto err; goto err;
} }
@ -3423,10 +3424,11 @@ static int ohci1394_pci_resume(struct pci_dev *dev)
reg_write(ohci, OHCI1394_IntMaskClear, 0xffffffff); reg_write(ohci, OHCI1394_IntMaskClear, 0xffffffff);
mdelay(50); mdelay(50);
if (request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED, err = request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED,
OHCI1394_DRIVER_NAME, ohci)) { OHCI1394_DRIVER_NAME, ohci);
if (err) {
PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq); PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq);
return -EIO; return err;
} }
ohci_initialize(ohci); ohci_initialize(ohci);