2006-02-08 06:45:51

by Chris Wright

[permalink] [raw]
Subject: [PATCH 09/23] Input: sidewinder - fix an oops

-stable review patch. If anyone has any objections, please let us know.
------------------

Dynalloc conversion strikes again...

Signed-off-by: Vojtech Pavlik <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---

drivers/input/joystick/sidewinder.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.15.3/drivers/input/joystick/sidewinder.c
===================================================================
--- linux-2.6.15.3.orig/drivers/input/joystick/sidewinder.c
+++ linux-2.6.15.3/drivers/input/joystick/sidewinder.c
@@ -736,7 +736,7 @@ static int sw_connect(struct gameport *g
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;

--