summaryrefslogtreecommitdiff
path: root/drivers/hid/hidraw.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2019-09-22 23:32:23 +0300
committerJiri Kosina <jkosina@suse.cz>2019-09-22 23:32:23 +0300
commit98656d503dd62258bfa8aaf2cd702ad3491e0713 (patch)
tree6fbe36f443ef8d4fc2054c288f6e338ef653fa9a /drivers/hid/hidraw.c
parentad049d525a86eecdf86211b6913fb9e19e7ef20c (diff)
parentc801aff1a57697d79618ea3e84dc8ff79617669d (diff)
downloadlinux-98656d503dd62258bfa8aaf2cd702ad3491e0713.tar.xz
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/hidraw.c')
-rw-r--r--drivers/hid/hidraw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 62ef47a730b0..bbc6ec1aa5cb 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -252,7 +252,7 @@ static __poll_t hidraw_poll(struct file *file, poll_table *wait)
poll_wait(file, &list->hidraw->wait, wait);
if (list->head != list->tail)
- return EPOLLIN | EPOLLRDNORM;
+ return EPOLLIN | EPOLLRDNORM | EPOLLOUT;
if (!list->hidraw->exist)
return EPOLLERR | EPOLLHUP;
return 0;