aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/evdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/evdev.c')
-rw-r--r--drivers/input/evdev.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 5f561fce32d8..a29d5ceb00cf 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -78,14 +78,19 @@ static int evdev_fasync(int fd, struct file *file, int on)
78{ 78{
79 int retval; 79 int retval;
80 struct evdev_list *list = file->private_data; 80 struct evdev_list *list = file->private_data;
81
81 retval = fasync_helper(fd, file, on, &list->fasync); 82 retval = fasync_helper(fd, file, on, &list->fasync);
83
82 return retval < 0 ? retval : 0; 84 return retval < 0 ? retval : 0;
83} 85}
84 86
85static int evdev_flush(struct file * file, fl_owner_t id) 87static int evdev_flush(struct file *file, fl_owner_t id)
86{ 88{
87 struct evdev_list *list = file->private_data; 89 struct evdev_list *list = file->private_data;
88 if (!list->evdev->exist) return -ENODEV; 90
91 if (!list->evdev->exist)
92 return -ENODEV;
93
89 return input_flush_device(&list->evdev->handle, file); 94 return input_flush_device(&list->evdev->handle, file);
90} 95}
91 96
@@ -300,6 +305,7 @@ static ssize_t evdev_read(struct file * file, char __user * buffer, size_t count
300static unsigned int evdev_poll(struct file *file, poll_table *wait) 305static unsigned int evdev_poll(struct file *file, poll_table *wait)
301{ 306{
302 struct evdev_list *list = file->private_data; 307 struct evdev_list *list = file->private_data;
308
303 poll_wait(file, &list->evdev->wait, wait); 309 poll_wait(file, &list->evdev->wait, wait);
304 return ((list->head == list->tail) ? 0 : (POLLIN | POLLRDNORM)) | 310 return ((list->head == list->tail) ? 0 : (POLLIN | POLLRDNORM)) |
305 (list->evdev->exist ? 0 : (POLLHUP | POLLERR)); 311 (list->evdev->exist ? 0 : (POLLHUP | POLLERR));