From cf59674494fbce14227e8fbf330d6ce53fb875ab Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 2 Aug 2011 22:22:46 -0700
Subject: [PATCH] --- yaml --- r: 269445 b: refs/heads/master c:
 5e3e4eb1bf212d9ae4997ebcbe2fdfb348b70213 h: refs/heads/master i:   269443:
 63b9d236a0b35040a8265eed65cea8dacfab8930 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/input/input-polldev.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5b878f8f6732..a0a6a2529dc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11205bb63e5c2e5174f377595103005b00c68370
+refs/heads/master: 5e3e4eb1bf212d9ae4997ebcbe2fdfb348b70213
diff --git a/trunk/drivers/input/input-polldev.c b/trunk/drivers/input/input-polldev.c
index b1aabde87523..b253973881b8 100644
--- a/trunk/drivers/input/input-polldev.c
+++ b/trunk/drivers/input/input-polldev.c
@@ -49,8 +49,10 @@ static int input_open_polled_device(struct input_dev *input)
 		dev->open(dev);
 
 	/* Only start polling if polling is enabled */
-	if (dev->poll_interval > 0)
-		queue_delayed_work(system_freezable_wq, &dev->work, 0);
+	if (dev->poll_interval > 0) {
+		dev->poll(dev);
+		input_polldev_queue_work(dev);
+	}
 
 	return 0;
 }