summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/grip.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-20 23:39:47 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-20 23:39:47 +0100
commit55fa518867978e1f5fd8353098f80d125ac734d7 (patch)
tree3502b331c1f9ec4cac25dc8ba30b6a0a324e350c /drivers/input/joystick/grip.c
parentALSA: ca0106 MSI K8N Diamond MB spi_dac 2->1 (diff)
parentALSA: pcsp - Fix starting the stream with HRTIMER_CB_IRQSAFE_UNLOCK (diff)
downloadlinux-55fa518867978e1f5fd8353098f80d125ac734d7.tar.xz
linux-55fa518867978e1f5fd8353098f80d125ac734d7.zip
Merge branch 'topic/pcsp-fix' into topic/misc
Diffstat (limited to 'drivers/input/joystick/grip.c')
-rw-r--r--drivers/input/joystick/grip.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index 684e07cfccc8..fc55899ba6c5 100644
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -426,8 +426,7 @@ static struct gameport_driver grip_drv = {
static int __init grip_init(void)
{
- gameport_register_driver(&grip_drv);
- return 0;
+ return gameport_register_driver(&grip_drv);
}
static void __exit grip_exit(void)