Merge branch 'linus' into core/urgent

[linux-2.6-omap-h63xx.git] / drivers / input / joystick / a3d.c

diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index 92498d470b1f7de7323eed8b87dfcd8dffa72d7e..6489f4010c4f2f6944090d8829b264bbd067901d 100644 (file)
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -414,8 +414,7 @@ static struct gameport_driver a3d_drv = {
 
 static int __init a3d_init(void)
 {
-       gameport_register_driver(&a3d_drv);
-       return 0;
+       return gameport_register_driver(&a3d_drv);
 }
 
 static void __exit a3d_exit(void)