input: check return value of serio_register_driver()
PATCH 2/2 input: check return value of serio_register_driver()
check return value of serio_register_driver()
Cc Dmitry Torokhov <[email protected]>
Signed-off-by Akinobu Mita <[email protected]>
drivers/input/joystick/iforce/iforce-main.c | 14 +++++++++++--- drivers/input/joystick/magellan.c | 3 +-- drivers/input/joystick/spaceball.c | 3 +-- drivers/input/joystick/spaceorb.c | 3 +-- drivers/input/joystick/stinger.c | 3 +-- drivers/input/joystick/twidjoy.c | 3 +-- drivers/input/joystick/warrior.c | 3 +-- drivers/input/keyboard/atkbd.c | 3 +-- drivers/input/keyboard/hil_kbd.c | 3 +-- drivers/input/keyboard/lkkbd.c | 3 +-- drivers/input/keyboard/newtonkbd.c | 3 +-- drivers/input/keyboard/stowaway.c | 3 +-- drivers/input/keyboard/sunkbd.c | 3 +-- drivers/input/keyboard/xtkbd.c | 3 +-- drivers/input/mouse/hil_ptr.c | 3 +-- drivers/input/mouse/psmouse-base.c | 8 ++++++-- drivers/input/mouse/sermouse.c | 3 +-- drivers/input/mouse/vsxxxaa.c | 3 +-- drivers/input/touchscreen/elo.c | 3 +-- drivers/input/touchscreen/gunze.c | 3 +-- drivers/input/touchscreen/h3600_ts_input.c | 3 +-- drivers/input/touchscreen/mtouch.c | 3 +-- drivers/input/touchscreen/penmount.c | 3 +-- drivers/input/touchscreen/touchright.c | 3 +-- drivers/input/touchscreen/touchwin.c | 3 +-- 25 files changed, 40 insertions(+), 51 deletions(-)
drivers/input/mouse/vsxxxaa.c +1 -2
@@ -571,8 +571,7 @@ static struct serio_driver vsxxxaa_drv =static int __init vsxxxaa_init (void ) { -serio_register_driver (&vsxxxaa_drv); -return 0 ; +return serio_register_driver (&vsxxxaa_drv); }static void __exit
drivers/input/mouse/psmouse-base.c +6 -2
@@ -1509,15 +1509,19 @@ static int psmouse_get_maxproto(char *bustatic int __init psmouse_init (void ) { +int err; + kpsmoused_wq =create_singlethread_workqueue ("kpsmoused" );if (!kpsmoused_wq) {printk (KERN_ERR "psmouse: failed to create kpsmoused workqueue\n" );return -ENOMEM ; } -serio_register_driver (&psmouse_drv); + err =serio_register_driver (&psmouse_drv); +if (err) +destroy_workqueue (kpsmoused_wq); -return 0 ; +return err; } static void __exit psmouse_exit(void)
drivers/input/touchscreen/elo.c +1 -2
@@ -397,8 +397,7 @@ static struct serio_driver elo_drv = {static int __init elo_init (void ) { -serio_register_driver (&elo_drv); -return 0 ; +return serio_register_driver (&elo_drv); } static void __exit elo_exit(void)
drivers/input/touchscreen/gunze.c +1 -2
@@ -190,8 +190,7 @@ static struct serio_driver gunze_drv = {static int __init gunze_init (void ) { -serio_register_driver (&gunze_drv); -return 0 ; +return serio_register_driver (&gunze_drv); } static void __exit gunze_exit(void)
drivers/input/touchscreen/h3600_ts_input.c +1 -2
@@ -478,8 +478,7 @@ static struct serio_driver h3600ts_drv =static int __init h3600ts_init (void ) { -serio_register_driver (&h3600ts_drv); -return 0 ; +return serio_register_driver (&h3600ts_drv); } static void __exit h3600ts_exit(void)
drivers/input/touchscreen/mtouch.c +1 -2
@@ -205,8 +205,7 @@ static struct serio_driver mtouch_drv =static int __init mtouch_init (void ) { -serio_register_driver (&mtouch_drv); -return 0 ; +return serio_register_driver (&mtouch_drv); } static void __exit mtouch_exit(void)
drivers/input/touchscreen/penmount.c +1 -2
@@ -171,8 +171,7 @@ static struct serio_driver pm_drv = {static int __init pm_init (void ) { -serio_register_driver (&pm_drv); -return 0 ; +return serio_register_driver (&pm_drv); } static void __exit pm_exit(void)
drivers/input/touchscreen/touchright.c +1 -2
@@ -182,8 +182,7 @@ static struct serio_driver tr_drv = {static int __init tr_init (void ) { -serio_register_driver (&tr_drv); -return 0 ; +return serio_register_driver (&tr_drv); } static void __exit tr_exit(void)
drivers/input/touchscreen/touchwin.c +1 -2
@@ -189,8 +189,7 @@ static struct serio_driver tw_drv = {static int __init tw_init (void ) { -serio_register_driver (&tw_drv); -return 0 ; +return serio_register_driver (&tw_drv); } static void __exit tw_exit(void)
drivers/input/keyboard/atkbd.c +1 -2
@@ -1293,8 +1293,7 @@ static ssize_t atkbd_show_err_count(strustatic int __init atkbd_init (void ) { -serio_register_driver (&atkbd_drv); -return 0 ; +return serio_register_driver (&atkbd_drv); } static void __exit atkbd_exit(void)
drivers/input/keyboard/hil_kbd.c +1 -2
@@ -381,8 +381,7 @@ struct serio_driver hil_kbd_serio_drv =static int __init hil_kbd_init (void ) { -serio_register_driver (&hil_kbd_serio_drv); -return 0 ; +return serio_register_driver (&hil_kbd_serio_drv); } static void __exit hil_kbd_exit(void)
drivers/input/keyboard/lkkbd.c +1 -2
@@ -754,8 +754,7 @@ static struct serio_driver lkkbd_drv = {static int __init lkkbd_init (void ) { -serio_register_driver (&lkkbd_drv); -return 0 ; +return serio_register_driver (&lkkbd_drv); }static void __exit
drivers/input/keyboard/newtonkbd.c +1 -2
@@ -165,8 +165,7 @@ static struct serio_driver nkbd_drv = {static int __init nkbd_init (void ) { -serio_register_driver (&nkbd_drv); -return 0 ; +return serio_register_driver (&nkbd_drv); } static void __exit nkbd_exit(void)
drivers/input/keyboard/stowaway.c +1 -2
@@ -173,8 +173,7 @@ static struct serio_driver skbd_drv = {static int __init skbd_init (void ) { -serio_register_driver (&skbd_drv); -return 0 ; +return serio_register_driver (&skbd_drv); } static void __exit skbd_exit(void)
drivers/input/keyboard/sunkbd.c +1 -2
@@ -346,8 +346,7 @@ static struct serio_driver sunkbd_drv =static int __init sunkbd_init (void ) { -serio_register_driver (&sunkbd_drv); -return 0 ; +return serio_register_driver (&sunkbd_drv); } static void __exit sunkbd_exit(void)
drivers/input/keyboard/xtkbd.c +1 -2
@@ -170,8 +170,7 @@ static struct serio_driver xtkbd_drv = {static int __init xtkbd_init (void ) { -serio_register_driver (&xtkbd_drv); -return 0 ; +return serio_register_driver (&xtkbd_drv); } static void __exit xtkbd_exit(void)
drivers/input/mouse/hil_ptr.c +1 -2
@@ -417,8 +417,7 @@ static struct serio_driver hil_ptr_seriostatic int __init hil_ptr_init (void ) { -serio_register_driver (&hil_ptr_serio_driver); -return 0 ; +return serio_register_driver (&hil_ptr_serio_driver); } static void __exit hil_ptr_exit(void)
drivers/input/mouse/sermouse.c +1 -2
@@ -348,8 +348,7 @@ static struct serio_driver sermouse_drvstatic int __init sermouse_init (void ) { -serio_register_driver (&sermouse_drv); -return 0 ; +return serio_register_driver (&sermouse_drv); } static void __exit sermouse_exit(void)
drivers/input/joystick/iforce/iforce-main.c +11 -3
@@ -464,13 +464,21 @@ int iforce_init_device(struct iforce *ifstatic int __init iforce_init (void ) { +int err =0 ; +#ifdef CONFIG_JOYSTICK_IFORCE_USB -usb_register (&iforce_usb_driver); + err =usb_register (&iforce_usb_driver); +if (err) +return err;#endif #ifdef CONFIG_JOYSTICK_IFORCE_232 -serio_register_driver (&iforce_serio_drv); + err =serio_register_driver (&iforce_serio_drv); +#ifdef CONFIG_JOYSTICK_IFORCE_USB +if (err) +usb_deregister (&iforce_usb_driver); +#endif #endif -return 0 ; +return err; } static void __exit iforce_exit(void)
drivers/input/joystick/magellan.c +1 -2
@@ -227,8 +227,7 @@ static struct serio_driver magellan_drvstatic int __init magellan_init (void ) { -serio_register_driver (&magellan_drv); -return 0 ; +return serio_register_driver (&magellan_drv); } static void __exit magellan_exit(void)
drivers/input/joystick/spaceball.c +1 -2
@@ -296,8 +296,7 @@ static struct serio_driver spaceball_drvstatic int __init spaceball_init (void ) { -serio_register_driver (&spaceball_drv); -return 0 ; +return serio_register_driver (&spaceball_drv); } static void __exit spaceball_exit(void)
drivers/input/joystick/spaceorb.c +1 -2
@@ -242,8 +242,7 @@ static struct serio_driver spaceorb_drvstatic int __init spaceorb_init (void ) { -serio_register_driver (&spaceorb_drv); -return 0 ; +return serio_register_driver (&spaceorb_drv); } static void __exit spaceorb_exit(void)
drivers/input/joystick/stinger.c +1 -2
@@ -212,8 +212,7 @@ static struct serio_driver stinger_drv =static int __init stinger_init (void ) { -serio_register_driver (&stinger_drv); -return 0 ; +return serio_register_driver (&stinger_drv); } static void __exit stinger_exit(void)
drivers/input/joystick/twidjoy.c +1 -2
@@ -265,8 +265,7 @@ static struct serio_driver twidjoy_drv =static int __init twidjoy_init (void ) { -serio_register_driver (&twidjoy_drv); -return 0 ; +return serio_register_driver (&twidjoy_drv); } static void __exit twidjoy_exit(void)
drivers/input/joystick/warrior.c +1 -2
@@ -220,8 +220,7 @@ static struct serio_driver warrior_drv =static int __init warrior_init (void ) { -serio_register_driver (&warrior_drv); -return 0 ; +return serio_register_driver (&warrior_drv); } static void __exit warrior_exit(void)