From 76e810484ad3a664eda60b37ca4fbf7406a69661 Mon Sep 17 00:00:00 2001 From: Samu Onkalo Date: Mon, 23 Nov 2009 10:01:33 -0800 Subject: [PATCH] --- yaml --- r: 174251 b: refs/heads/master c: 11bb4cc7c772963952304398f999fc195b0da285 h: refs/heads/master i: 174249: a2178f4216d15b2713b88291c1e55ecc21054265 174247: 3bb45d29df535a481836d3230ad43298b1cf9e71 v: v3 --- [refs] | 2 +- trunk/drivers/input/input-polldev.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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; }