1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
index 40cf0b058927..6a2eb399b988 100644
--- a/drivers/input/input-polldev.c
+++ b/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;
 }