Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (34 commits)
  Input: i8042 - non-x86 build fix
  Input: pxa27x_keypad - also enable on PXA3xx
  Input: pxa27x_keypad - add debounce_interval to the keypad platform data
  Input: pxa27x_keypad - use device resources for I/O memory mapping and IRQ
  Input: pxa27x_keypad - enable rotary encoders and direct keys
  Input: pxa27x_keypad - introduce pxa27x_keypad_config()
  Input: pxa27x_keypad - introduce driver structure and use KEY() to define matrix keys
  Input: pxa27x_keypad - remove pin configuration from the driver
  Input: pxa27x_keypad - rename the driver (was pxa27x_keyboard)
  Input: constify function pointer tables (seq_operations)
  Input: i8042 - add Fujitsu-Siemens Amilo Pro 2010 to nomux list
  Input: i8042 - enable DMI quirks on x86-64
  Input: i8042 - add Dritek quirk for Acer Aspire 9110
  Input: add input event to APM event bridge
  Input: mousedev - use BIT_MASK instead of BIT
  Input: remove duplicate includes
  Input: remove cdev from input_dev structure
  Input: remove duplicated headers in drivers/char/keyboard.c
  Input: i8042 - add Dritek keyboard extension quirk
  Input: add Tosa keyboard driver
  ...

1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
index 92b359894e..490918a5d1 100644
--- a/drivers/input/input-polldev.c
+++ b/drivers/input/input-polldev.c
@@ -60,17 +60,21 @@ static void input_polled_device_work(struct work_struct *work)
 {
         struct input_polled_dev *dev =
                 container_of(work, struct input_polled_dev, work.work);
+        unsigned long delay;
 
         dev->poll(dev);
-        queue_delayed_work(polldev_wq, &dev->work,
-                           msecs_to_jiffies(dev->poll_interval));
+
+        delay = msecs_to_jiffies(dev->poll_interval);
+        if (delay >= HZ)
+                delay = round_jiffies_relative(delay);
+
+        queue_delayed_work(polldev_wq, &dev->work, delay);
 }
 
 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)
@@ -79,10 +83,8 @@ static int input_open_polled_device(struct input_dev *input)
         if (dev->flush)
                 dev->flush(dev);
 
-        ticks = msecs_to_jiffies(dev->poll_interval);
-        if (ticks >= HZ)
-                ticks = round_jiffies(ticks);
-        queue_delayed_work(polldev_wq, &dev->work, ticks);
+        queue_delayed_work(polldev_wq, &dev->work,
+                           msecs_to_jiffies(dev->poll_interval));
 
         return 0;
 }
@@ -91,7 +93,7 @@ static void input_close_polled_device(struct input_dev *input)
 {
         struct input_polled_dev *dev = input->private;
 
-        cancel_rearming_delayed_workqueue(polldev_wq, &dev->work);
+        cancel_delayed_work_sync(&dev->work);
         input_polldev_stop_workqueue();
 }