Skip to content

Commit 98656d5

Browse files
author
Jiri Kosina
committed
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 <[email protected]>
2 parents ad049d5 + c801aff commit 98656d5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/hid/hidraw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ static __poll_t hidraw_poll(struct file *file, poll_table *wait)
252252

253253
poll_wait(file, &list->hidraw->wait, wait);
254254
if (list->head != list->tail)
255-
return EPOLLIN | EPOLLRDNORM;
255+
return EPOLLIN | EPOLLRDNORM | EPOLLOUT;
256256
if (!list->hidraw->exist)
257257
return EPOLLERR | EPOLLHUP;
258258
return 0;

drivers/hid/usbhid/hiddev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ static __poll_t hiddev_poll(struct file *file, poll_table *wait)
428428

429429
poll_wait(file, &list->hiddev->wait, wait);
430430
if (list->head != list->tail)
431-
return EPOLLIN | EPOLLRDNORM;
431+
return EPOLLIN | EPOLLRDNORM | EPOLLOUT;
432432
if (!list->hiddev->exist)
433433
return EPOLLERR | EPOLLHUP;
434434
return 0;

0 commit comments

Comments
 (0)