git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SPARC] uctrl: Check request_irq() return value.
[pandora-kernel.git]
/
drivers
/
sbus
/
char
/
uctrl.c
diff --git
a/drivers/sbus/char/uctrl.c
b/drivers/sbus/char/uctrl.c
index
4d1a505
..
44d2ef9
100644
(file)
--- a/
drivers/sbus/char/uctrl.c
+++ b/
drivers/sbus/char/uctrl.c
@@
-5,7
+5,6
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
-#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
@@
-365,6
+364,7
@@
static int __init ts102_uctrl_init(void)
struct linux_prom_irqs tmp_irq[2];
unsigned int vaddr[2] = { 0, 0 };
int tmpnode, uctrlnode = prom_getchild(prom_root_node);
struct linux_prom_irqs tmp_irq[2];
unsigned int vaddr[2] = { 0, 0 };
int tmpnode, uctrlnode = prom_getchild(prom_root_node);
+ int err;
tmpnode = prom_searchsiblings(uctrlnode, "obio");
tmpnode = prom_searchsiblings(uctrlnode, "obio");
@@
-390,7
+390,12
@@
static int __init ts102_uctrl_init(void)
if(!driver->irq)
driver->irq = tmp_irq[0].pri;
if(!driver->irq)
driver->irq = tmp_irq[0].pri;
- request_irq(driver->irq, uctrl_interrupt, 0, "uctrl", driver);
+ err = request_irq(driver->irq, uctrl_interrupt, 0, "uctrl", driver);
+ if (err) {
+ printk("%s: unable to register irq %d\n",
+ __FUNCTION__, driver->irq);
+ return err;
+ }
if (misc_register(&uctrl_dev)) {
printk("%s: unable to get misc minor %d\n",
if (misc_register(&uctrl_dev)) {
printk("%s: unable to get misc minor %d\n",