summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/joydump.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2008-10-15 23:29:12 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-10-15 23:29:12 -0400
commit4c0e799a9a6dc64426ddb6c03aea1a154357658f (patch)
tree2d9aa9493d80fceb178a63bf15bb3d9edfc5fbae /drivers/input/joystick/joydump.c
parent3fa8749e584b55f1180411ab1b51117190bac1e5 (diff)
parentb8d055a878ee0f997ded40649701089d2486f850 (diff)
downloadop-kernel-dev-4c0e799a9a6dc64426ddb6c03aea1a154357658f.zip
op-kernel-dev-4c0e799a9a6dc64426ddb6c03aea1a154357658f.tar.gz
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/joystick/joydump.c')
-rw-r--r--drivers/input/joystick/joydump.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/joystick/joydump.c b/drivers/input/joystick/joydump.c
index 2a1b82c..cd894a0 100644
--- a/drivers/input/joystick/joydump.c
+++ b/drivers/input/joystick/joydump.c
@@ -161,8 +161,7 @@ static struct gameport_driver joydump_drv = {
static int __init joydump_init(void)
{
- gameport_register_driver(&joydump_drv);
- return 0;
+ return gameport_register_driver(&joydump_drv);
}
static void __exit joydump_exit(void)
OpenPOWER on IntegriCloud