Input: polled device - do not start polling if interval is zero

[safe/jmp/linux-2.6] / drivers / input / input-polldev.c

diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
index 40cf0b0..6a2eb39 100644 (file)
--- 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;
 }