diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:32:23 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:32:23 +0200 |
| commit | 98656d503dd62258bfa8aaf2cd702ad3491e0713 (patch) | |
| tree | 6fbe36f443ef8d4fc2054c288f6e338ef653fa9a /drivers/hid | |
| parent | Merge branch 'for-5.4/core' into for-linus (diff) | |
| parent | hiddev: Return EPOLLOUT from hiddev_poll (diff) | |
| download | linux-98656d503dd62258bfa8aaf2cd702ad3491e0713.tar.xz linux-98656d503dd62258bfa8aaf2cd702ad3491e0713.zip | |
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')
| -rw-r--r-- | drivers/hid/hidraw.c | 2 | ||||
| -rw-r--r-- | drivers/hid/usbhid/hiddev.c | 2 |
2 files changed, 2 insertions, 2 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; 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) poll_wait(file, &list->hiddev->wait, wait); if (list->head != list->tail) - return EPOLLIN | EPOLLRDNORM; + return EPOLLIN | EPOLLRDNORM | EPOLLOUT; if (!list->hiddev->exist) return EPOLLERR | EPOLLHUP; return 0; |