| Message ID | 20191204023713.3983-1-marcel@holtmann.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 9f3b61dc1dd7b81e99e7ed23776bb64a35f39e1a |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | hidraw: Fix returning EPOLLOUT from hidraw_poll | expand |
On Wed, 4 Dec 2019, Marcel Holtmann wrote: > When polling a connected /dev/hidrawX device, it is useful to get the > EPOLLOUT when writing is possible. Since writing is possible as soon as > the device is connected, always return it. > > Right now EPOLLOUT is only returned when there are also input reports > are available. This works if devices start sending reports when > connected, but some HID devices might need an output report first before > sending any input reports. This change will allow using EPOLLOUT here as > well. > > Fixes: 378b80370aa1 ("hidraw: Return EPOLLOUT from hidraw_poll") > Signed-off-by: Marcel Holtmann <marcel@holtmann.org> > Cc: stable@vger.kernel.org Applied, thanks Marcel.
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index bbc6ec1aa5cb..c25e95c19cad 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c @@ -252,10 +252,10 @@ 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 | EPOLLOUT; + return EPOLLIN | EPOLLRDNORM; if (!list->hidraw->exist) return EPOLLERR | EPOLLHUP; - return 0; + return EPOLLOUT | EPOLLWRNORM; } static int hidraw_open(struct inode *inode, struct file *file)
When polling a connected /dev/hidrawX device, it is useful to get the EPOLLOUT when writing is possible. Since writing is possible as soon as the device is connected, always return it. Right now EPOLLOUT is only returned when there are also input reports are available. This works if devices start sending reports when connected, but some HID devices might need an output report first before sending any input reports. This change will allow using EPOLLOUT here as well. Fixes: 378b80370aa1 ("hidraw: Return EPOLLOUT from hidraw_poll") Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org --- drivers/hid/hidraw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)