summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-04 00:52:20 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-08 16:34:55 -0700
commitfa88661224946145819a904cef2ec7dd5c9c78bc (patch)
tree96bf48261022a21a35c9278b7cea8c9752b061f9 /drivers/input
parentd15c22e78674f9a5bc0de0932a43abe1aafae303 (diff)
downloadblackbird-op-linux-fa88661224946145819a904cef2ec7dd5c9c78bc.tar.gz
blackbird-op-linux-fa88661224946145819a904cef2ec7dd5c9c78bc.zip
Input: fix polling of /proc/bus/input/devices
Tested-by: Alessio Sangalli <alesan@manoweb.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/input.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 46e9ce195064..913392f63f76 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -744,11 +744,11 @@ static inline void input_wakeup_procfs_readers(void)
static unsigned int input_proc_devices_poll(struct file *file, poll_table *wait)
{
- int state = input_devices_state;
-
poll_wait(file, &input_devices_poll_wait, wait);
- if (state != input_devices_state)
+ if (file->f_version != input_devices_state) {
+ file->f_version = input_devices_state;
return POLLIN | POLLRDNORM;
+ }
return 0;
}
OpenPOWER on IntegriCloud