Commit 98656d50 authored by Jiri Kosina's avatar Jiri Kosina

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: default avatarJiri Kosina <jkosina@suse.cz>
parents ad049d52 c801aff1
...@@ -252,7 +252,7 @@ static __poll_t hidraw_poll(struct file *file, poll_table *wait) ...@@ -252,7 +252,7 @@ static __poll_t hidraw_poll(struct file *file, poll_table *wait)
poll_wait(file, &list->hidraw->wait, wait); poll_wait(file, &list->hidraw->wait, wait);
if (list->head != list->tail) if (list->head != list->tail)
return EPOLLIN | EPOLLRDNORM; return EPOLLIN | EPOLLRDNORM | EPOLLOUT;
if (!list->hidraw->exist) if (!list->hidraw->exist)
return EPOLLERR | EPOLLHUP; return EPOLLERR | EPOLLHUP;
return 0; return 0;
......
...@@ -428,7 +428,7 @@ static __poll_t hiddev_poll(struct file *file, poll_table *wait) ...@@ -428,7 +428,7 @@ static __poll_t hiddev_poll(struct file *file, poll_table *wait)
poll_wait(file, &list->hiddev->wait, wait); poll_wait(file, &list->hiddev->wait, wait);
if (list->head != list->tail) if (list->head != list->tail)
return EPOLLIN | EPOLLRDNORM; return EPOLLIN | EPOLLRDNORM | EPOLLOUT;
if (!list->hiddev->exist) if (!list->hiddev->exist)
return EPOLLERR | EPOLLHUP; return EPOLLERR | EPOLLHUP;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment