summaryrefslogtreecommitdiff
path: root/drivers/input/input-polldev.c
diff options
context:
space:
mode:
authorSamu Onkalo <samu.p.onkalo@nokia.com>2009-11-23 21:01:33 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-11-23 21:16:09 +0300
commit11bb4cc7c772963952304398f999fc195b0da285 (patch)
treec7e719cb1b4b8dfefcfbc5a96af28dc194aff52e /drivers/input/input-polldev.c
parent381f3f1ccf380d4d3c46987d04c199842d4c6e1f (diff)
downloadlinux-11bb4cc7c772963952304398f999fc195b0da285.tar.xz
Input: polled device - do not start polling if interval is zero
If the poll interval is set to 0 via new sysfs entry and device is opened after that, polling is started with interval 0. This causes huge CPU load. Same happens if the rate was 0 when the device was closed and then reopened. Signed-off-by: Samu Onkalo <samu.p.onkalo@nokia.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/input-polldev.c')
-rw-r--r--drivers/input/input-polldev.c4
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;
}