diff --git a/[refs] b/[refs]
index b5ae15098e26..a51e63664d03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e9d675ed24bcefd0d99b531a9d7faf794b762c8
+refs/heads/master: 847fd5fbf70e82baf042556968f885066489b164
diff --git a/trunk/drivers/input/joystick/sidewinder.c b/trunk/drivers/input/joystick/sidewinder.c
index 78dd163cd702..03f9e7ed0304 100644
--- a/trunk/drivers/input/joystick/sidewinder.c
+++ b/trunk/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;