diff options
author | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 16:32:23 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 16:32:23 -0400 |
commit | 98656d503dd62258bfa8aaf2cd702ad3491e0713 (patch) | |
tree | 6fbe36f443ef8d4fc2054c288f6e338ef653fa9a /drivers/hid/usbhid | |
parent | ad049d525a86eecdf86211b6913fb9e19e7ef20c (diff) | |
parent | c801aff1a57697d79618ea3e84dc8ff79617669d (diff) |
Merge branch 'for-5.4/hidraw-hiddev-epoll' into for-linus
- proper propagation of EPOLLOUT from hiddev and hidraw, from
Fabian Henneke
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid')
-rw-r--r-- | drivers/hid/usbhid/hiddev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 4e11cc6fc34b..1f9bc4483465 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c | |||
@@ -428,7 +428,7 @@ static __poll_t hiddev_poll(struct file *file, poll_table *wait) | |||
428 | 428 | ||
429 | poll_wait(file, &list->hiddev->wait, wait); | 429 | poll_wait(file, &list->hiddev->wait, wait); |
430 | if (list->head != list->tail) | 430 | if (list->head != list->tail) |
431 | return EPOLLIN | EPOLLRDNORM; | 431 | return EPOLLIN | EPOLLRDNORM | EPOLLOUT; |
432 | if (!list->hiddev->exist) | 432 | if (!list->hiddev->exist) |
433 | return EPOLLERR | EPOLLHUP; | 433 | return EPOLLERR | EPOLLHUP; |
434 | return 0; | 434 | return 0; |