diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-02-26 12:46:54 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-26 14:35:51 -0500 |
commit | 19ba1b19962aeb87a029b37234f54b02e8f7b507 (patch) | |
tree | 718df51edcc2926fa40302c3b29bc04f59d150b7 /drivers/sbus/char/uctrl.c | |
parent | c5b002c1bf31d1145271b28ed63db5e4f893dfd3 (diff) |
[SPARC] uctrl: Check request_irq() return value.
Based upon a patch by Monakhov Dmitriy.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/sbus/char/uctrl.c')
-rw-r--r-- | drivers/sbus/char/uctrl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index 45cf5bc0bbee..44d2ef906ac7 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c | |||
@@ -364,6 +364,7 @@ static int __init ts102_uctrl_init(void) | |||
364 | struct linux_prom_irqs tmp_irq[2]; | 364 | struct linux_prom_irqs tmp_irq[2]; |
365 | unsigned int vaddr[2] = { 0, 0 }; | 365 | unsigned int vaddr[2] = { 0, 0 }; |
366 | int tmpnode, uctrlnode = prom_getchild(prom_root_node); | 366 | int tmpnode, uctrlnode = prom_getchild(prom_root_node); |
367 | int err; | ||
367 | 368 | ||
368 | tmpnode = prom_searchsiblings(uctrlnode, "obio"); | 369 | tmpnode = prom_searchsiblings(uctrlnode, "obio"); |
369 | 370 | ||
@@ -389,7 +390,12 @@ static int __init ts102_uctrl_init(void) | |||
389 | if(!driver->irq) | 390 | if(!driver->irq) |
390 | driver->irq = tmp_irq[0].pri; | 391 | driver->irq = tmp_irq[0].pri; |
391 | 392 | ||
392 | request_irq(driver->irq, uctrl_interrupt, 0, "uctrl", driver); | 393 | err = request_irq(driver->irq, uctrl_interrupt, 0, "uctrl", driver); |
394 | if (err) { | ||
395 | printk("%s: unable to register irq %d\n", | ||
396 | __FUNCTION__, driver->irq); | ||
397 | return err; | ||
398 | } | ||
393 | 399 | ||
394 | if (misc_register(&uctrl_dev)) { | 400 | if (misc_register(&uctrl_dev)) { |
395 | printk("%s: unable to get misc minor %d\n", | 401 | printk("%s: unable to get misc minor %d\n", |