Commit 153a9df0 authored by Akinobu Mita's avatar Akinobu Mita Committed by Dmitry Torokhov
Browse files

Input: handle serio_register_driver() errors 



Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent ed7b1f6d

drivers/input/joystick/iforce/iforce-main.c

+11 −3
Original line number Diff line number Diff line
@@ -467,13 +467,21 @@ int iforce_init_device(struct iforce *iforce) 


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

	return 0;

#endif

	return err;

}



static void __exit iforce_exit(void)

drivers/input/joystick/magellan.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/input/joystick/spaceball.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/input/joystick/spaceorb.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/input/joystick/stinger.c

+1 −2
Original line number Diff line number Diff line
@@ -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)