diff --git a/[refs] b/[refs]
index db16f2f8fc2c..d1e5ce0c76d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e15b02138b89d7bc053817e6f7601e92e29d371c
+refs/heads/master: 14134b31ae646220a5a451e38aae1dd023d457cb
diff --git a/trunk/drivers/input/input-polldev.c b/trunk/drivers/input/input-polldev.c
index b773d4c756a6..92b359894e81 100644
--- a/trunk/drivers/input/input-polldev.c
+++ b/trunk/drivers/input/input-polldev.c
@@ -70,6 +70,7 @@ static int input_open_polled_device(struct input_dev *input)
 {
 	struct input_polled_dev *dev = input->private;
 	int error;
+	unsigned long ticks;
 
 	error = input_polldev_start_workqueue();
 	if (error)
@@ -78,8 +79,10 @@ static int input_open_polled_device(struct input_dev *input)
 	if (dev->flush)
 		dev->flush(dev);
 
-	queue_delayed_work(polldev_wq, &dev->work,
-			   msecs_to_jiffies(dev->poll_interval));
+	ticks = msecs_to_jiffies(dev->poll_interval);
+	if (ticks >= HZ)
+		ticks = round_jiffies(ticks);
+	queue_delayed_work(polldev_wq, &dev->work, ticks);
 
 	return 0;
 }