diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-04 03:52:20 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-08 19:34:55 -0400 |
commit | fa88661224946145819a904cef2ec7dd5c9c78bc (patch) | |
tree | 96bf48261022a21a35c9278b7cea8c9752b061f9 | |
parent | d15c22e78674f9a5bc0de0932a43abe1aafae303 (diff) |
Input: fix polling of /proc/bus/input/devices
Tested-by: Alessio Sangalli <alesan@manoweb.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r-- | drivers/input/input.c | 6 |
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) | |||
744 | 744 | ||
745 | static unsigned int input_proc_devices_poll(struct file *file, poll_table *wait) | 745 | static unsigned int input_proc_devices_poll(struct file *file, poll_table *wait) |
746 | { | 746 | { |
747 | int state = input_devices_state; | ||
748 | |||
749 | poll_wait(file, &input_devices_poll_wait, wait); | 747 | poll_wait(file, &input_devices_poll_wait, wait); |
750 | if (state != input_devices_state) | 748 | if (file->f_version != input_devices_state) { |
749 | file->f_version = input_devices_state; | ||
751 | return POLLIN | POLLRDNORM; | 750 | return POLLIN | POLLRDNORM; |
751 | } | ||
752 | 752 | ||
753 | return 0; | 753 | return 0; |
754 | } | 754 | } |