From: Akinobu Mita Now serio_register_driver() returns error. This patch checks serio_register_driver() error Cc: Dmitry Torokhov Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton --- 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(-) diff -puN drivers/input/joystick/iforce/iforce-main.c~input-check-serio_register_driver-error drivers/input/joystick/iforce/iforce-main.c --- a/drivers/input/joystick/iforce/iforce-main.c~input-check-serio_register_driver-error +++ a/drivers/input/joystick/iforce/iforce-main.c @@ -467,13 +467,21 @@ int iforce_init_device(struct iforce *if static 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) diff -puN drivers/input/joystick/magellan.c~input-check-serio_register_driver-error drivers/input/joystick/magellan.c --- a/drivers/input/joystick/magellan.c~input-check-serio_register_driver-error +++ a/drivers/input/joystick/magellan.c @@ -231,8 +231,7 @@ static struct serio_driver magellan_drv static int __init magellan_init(void) { - serio_register_driver(&magellan_drv); - return 0; + return serio_register_driver(&magellan_drv); } static void __exit magellan_exit(void) diff -puN drivers/input/joystick/spaceball.c~input-check-serio_register_driver-error drivers/input/joystick/spaceball.c --- a/drivers/input/joystick/spaceball.c~input-check-serio_register_driver-error +++ a/drivers/input/joystick/spaceball.c @@ -300,8 +300,7 @@ static struct serio_driver spaceball_drv static int __init spaceball_init(void) { - serio_register_driver(&spaceball_drv); - return 0; + return serio_register_driver(&spaceball_drv); } static void __exit spaceball_exit(void) diff -puN drivers/input/joystick/spaceorb.c~input-check-serio_register_driver-error drivers/input/joystick/spaceorb.c --- a/drivers/input/joystick/spaceorb.c~input-check-serio_register_driver-error +++ a/drivers/input/joystick/spaceorb.c @@ -246,8 +246,7 @@ static struct serio_driver spaceorb_drv static int __init spaceorb_init(void) { - serio_register_driver(&spaceorb_drv); - return 0; + return serio_register_driver(&spaceorb_drv); } static void __exit spaceorb_exit(void) diff -puN drivers/input/joystick/stinger.c~input-check-serio_register_driver-error drivers/input/joystick/stinger.c --- a/drivers/input/joystick/stinger.c~input-check-serio_register_driver-error +++ a/drivers/input/joystick/stinger.c @@ -216,8 +216,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) diff -puN drivers/input/joystick/twidjoy.c~input-check-serio_register_driver-error drivers/input/joystick/twidjoy.c --- a/drivers/input/joystick/twidjoy.c~input-check-serio_register_driver-error +++ a/drivers/input/joystick/twidjoy.c @@ -269,8 +269,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) diff -puN drivers/input/joystick/warrior.c~input-check-serio_register_driver-error drivers/input/joystick/warrior.c --- a/drivers/input/joystick/warrior.c~input-check-serio_register_driver-error +++ a/drivers/input/joystick/warrior.c @@ -224,8 +224,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) diff -puN drivers/input/keyboard/atkbd.c~input-check-serio_register_driver-error drivers/input/keyboard/atkbd.c --- a/drivers/input/keyboard/atkbd.c~input-check-serio_register_driver-error +++ a/drivers/input/keyboard/atkbd.c @@ -1389,8 +1389,7 @@ static ssize_t atkbd_show_err_count(stru static int __init atkbd_init(void) { - serio_register_driver(&atkbd_drv); - return 0; + return serio_register_driver(&atkbd_drv); } static void __exit atkbd_exit(void) diff -puN drivers/input/keyboard/hil_kbd.c~input-check-serio_register_driver-error drivers/input/keyboard/hil_kbd.c --- a/drivers/input/keyboard/hil_kbd.c~input-check-serio_register_driver-error +++ a/drivers/input/keyboard/hil_kbd.c @@ -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) diff -puN drivers/input/keyboard/lkkbd.c~input-check-serio_register_driver-error drivers/input/keyboard/lkkbd.c --- a/drivers/input/keyboard/lkkbd.c~input-check-serio_register_driver-error +++ a/drivers/input/keyboard/lkkbd.c @@ -758,8 +758,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 diff -puN drivers/input/keyboard/newtonkbd.c~input-check-serio_register_driver-error drivers/input/keyboard/newtonkbd.c --- a/drivers/input/keyboard/newtonkbd.c~input-check-serio_register_driver-error +++ a/drivers/input/keyboard/newtonkbd.c @@ -169,8 +169,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) diff -puN drivers/input/keyboard/stowaway.c~input-check-serio_register_driver-error drivers/input/keyboard/stowaway.c --- a/drivers/input/keyboard/stowaway.c~input-check-serio_register_driver-error +++ a/drivers/input/keyboard/stowaway.c @@ -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) diff -puN drivers/input/keyboard/sunkbd.c~input-check-serio_register_driver-error drivers/input/keyboard/sunkbd.c --- a/drivers/input/keyboard/sunkbd.c~input-check-serio_register_driver-error +++ a/drivers/input/keyboard/sunkbd.c @@ -352,8 +352,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) diff -puN drivers/input/keyboard/xtkbd.c~input-check-serio_register_driver-error drivers/input/keyboard/xtkbd.c --- a/drivers/input/keyboard/xtkbd.c~input-check-serio_register_driver-error +++ a/drivers/input/keyboard/xtkbd.c @@ -174,8 +174,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) diff -puN drivers/input/mouse/hil_ptr.c~input-check-serio_register_driver-error drivers/input/mouse/hil_ptr.c --- a/drivers/input/mouse/hil_ptr.c~input-check-serio_register_driver-error +++ a/drivers/input/mouse/hil_ptr.c @@ -417,8 +417,7 @@ static struct serio_driver hil_ptr_serio static 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) diff -puN drivers/input/mouse/psmouse-base.c~input-check-serio_register_driver-error drivers/input/mouse/psmouse-base.c --- a/drivers/input/mouse/psmouse-base.c~input-check-serio_register_driver-error +++ a/drivers/input/mouse/psmouse-base.c @@ -1521,15 +1521,19 @@ static int psmouse_get_maxproto(char *bu static 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) diff -puN drivers/input/mouse/sermouse.c~input-check-serio_register_driver-error drivers/input/mouse/sermouse.c --- a/drivers/input/mouse/sermouse.c~input-check-serio_register_driver-error +++ a/drivers/input/mouse/sermouse.c @@ -351,8 +351,7 @@ static struct serio_driver sermouse_drv static int __init sermouse_init(void) { - serio_register_driver(&sermouse_drv); - return 0; + return serio_register_driver(&sermouse_drv); } static void __exit sermouse_exit(void) diff -puN drivers/input/mouse/vsxxxaa.c~input-check-serio_register_driver-error drivers/input/mouse/vsxxxaa.c --- a/drivers/input/mouse/vsxxxaa.c~input-check-serio_register_driver-error +++ a/drivers/input/mouse/vsxxxaa.c @@ -574,8 +574,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 diff -puN drivers/input/touchscreen/elo.c~input-check-serio_register_driver-error drivers/input/touchscreen/elo.c --- a/drivers/input/touchscreen/elo.c~input-check-serio_register_driver-error +++ a/drivers/input/touchscreen/elo.c @@ -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) diff -puN drivers/input/touchscreen/gunze.c~input-check-serio_register_driver-error drivers/input/touchscreen/gunze.c --- a/drivers/input/touchscreen/gunze.c~input-check-serio_register_driver-error +++ a/drivers/input/touchscreen/gunze.c @@ -194,8 +194,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) diff -puN drivers/input/touchscreen/h3600_ts_input.c~input-check-serio_register_driver-error drivers/input/touchscreen/h3600_ts_input.c --- a/drivers/input/touchscreen/h3600_ts_input.c~input-check-serio_register_driver-error +++ a/drivers/input/touchscreen/h3600_ts_input.c @@ -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) diff -puN drivers/input/touchscreen/mtouch.c~input-check-serio_register_driver-error drivers/input/touchscreen/mtouch.c --- a/drivers/input/touchscreen/mtouch.c~input-check-serio_register_driver-error +++ a/drivers/input/touchscreen/mtouch.c @@ -208,8 +208,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) diff -puN drivers/input/touchscreen/penmount.c~input-check-serio_register_driver-error drivers/input/touchscreen/penmount.c --- a/drivers/input/touchscreen/penmount.c~input-check-serio_register_driver-error +++ a/drivers/input/touchscreen/penmount.c @@ -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) diff -puN drivers/input/touchscreen/touchright.c~input-check-serio_register_driver-error drivers/input/touchscreen/touchright.c --- a/drivers/input/touchscreen/touchright.c~input-check-serio_register_driver-error +++ a/drivers/input/touchscreen/touchright.c @@ -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) diff -puN drivers/input/touchscreen/touchwin.c~input-check-serio_register_driver-error drivers/input/touchscreen/touchwin.c --- a/drivers/input/touchscreen/touchwin.c~input-check-serio_register_driver-error +++ a/drivers/input/touchscreen/touchwin.c @@ -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) _