* [PATCH] ieee1394: ohci1394: pass error codes from request_irq through
@ 2008-12-06 16:35 Stefan Richter
0 siblings, 0 replies; only message in thread
From: Stefan Richter @ 2008-12-06 16:35 UTC (permalink / raw)
To: linux1394-devel; +Cc: linux-kernel
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
drivers/ieee1394/ohci1394.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
Index: linux/drivers/ieee1394/ohci1394.c
===================================================================
--- linux.orig/drivers/ieee1394/ohci1394.c
+++ linux/drivers/ieee1394/ohci1394.c
@@ -3233,8 +3233,9 @@ static int __devinit ohci1394_pci_probe(
* 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 pc
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);
--
Stefan Richter
-=====-==--- ==-- --==-
http://arcgraph.de/sr/
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-12-06 16:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-12-06 16:35 [PATCH] ieee1394: ohci1394: pass error codes from request_irq through Stefan Richter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome