hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jiri Kosina 2019-09-22 22:32:23 +02:00
parent ad049d525a c801aff1a5
commit 98656d503d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hid/hidraw.c
View File

@ -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;

2
drivers/hid/usbhid/hiddev.c
View File

@ -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;