diff --git a/[refs] b/[refs]
index 1a436b3604ac..0658a81f522d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffc6b529e8c46c73827008c7406f43482d71beed
+refs/heads/master: 3575c3410071dc778d2d9c6002493a5dce73ec0b
diff --git a/trunk/drivers/input/joystick/grip.c b/trunk/drivers/input/joystick/grip.c
index a936e7aedb10..330c6717c149 100644
--- a/trunk/drivers/input/joystick/grip.c
+++ b/trunk/drivers/input/joystick/grip.c
@@ -192,6 +192,9 @@ static void grip_poll(struct gameport *gameport)
 	for (i = 0; i < 2; i++) {
 
 		dev = grip->dev[i];
+		if (!dev)
+			continue;
+
 		grip->reads++;
 
 		switch (grip->mode[i]) {