diff --git a/[refs] b/[refs]
index e3a7cbf91499..4043e4fc8b50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 381f3f1ccf380d4d3c46987d04c199842d4c6e1f
+refs/heads/master: 11bb4cc7c772963952304398f999fc195b0da285
diff --git a/trunk/drivers/input/input-polldev.c b/trunk/drivers/input/input-polldev.c
index 40cf0b058927..6a2eb399b988 100644
--- a/trunk/drivers/input/input-polldev.c
+++ b/trunk/drivers/input/input-polldev.c
@@ -88,7 +88,9 @@ static int input_open_polled_device(struct input_dev *input)
 	if (dev->open)
 		dev->open(dev);
 
-	queue_delayed_work(polldev_wq, &dev->work, 0);
+	/* Only start polling if polling is enabled */
+	if (dev->poll_interval > 0)
+		queue_delayed_work(polldev_wq, &dev->work, 0);
 
 	return 0;
 }