Merge branch 'topic/aoa' into to-push

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

diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index 25ec3fad9f2798d5126cec44e6b570a819152270..4058d4b272fe88fed73a2a3f0183b1d2cbeabd9b 100644 (file)
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -283,8 +283,7 @@ static struct gameport_driver guillemot_drv = {
 
 static int __init guillemot_init(void)
 {
-       gameport_register_driver(&guillemot_drv);
-       return 0;
+       return gameport_register_driver(&guillemot_drv);
 }
 
 static void __exit guillemot_exit(void)