summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick
diff options
context:
space:
mode:
authorZinx Verituse <zinx@bluecherry.net>2006-01-30 03:51:51 +0100
committerDmitry Torokhov <dtor_core@ameritech.net>2006-01-30 03:51:51 +0100
commit847fd5fbf70e82baf042556968f885066489b164 (patch)
tree1d49a0c639d35f4efa205da025fcef9aded5e186 /drivers/input/joystick
parentInput: db9 - handle errors from input_register_device() (diff)
downloadlinux-847fd5fbf70e82baf042556968f885066489b164.tar.xz
linux-847fd5fbf70e82baf042556968f885066489b164.zip
Input: sidewinder - fix an oops
Dynalloc conversion strikes again... Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/joystick')
-rw-r--r--drivers/input/joystick/sidewinder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index 78dd163cd702..03f9e7ed0304 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -736,7 +736,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
sprintf(sw->name, "Microsoft SideWinder %s", sw_name[sw->type]);
sprintf(sw->phys[i], "%s/input%d", gameport->phys, i);
- input_dev = input_allocate_device();
+ sw->dev[i] = input_dev = input_allocate_device();
if (!input_dev) {
err = -ENOMEM;
goto fail3;