aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2019-12-06 11:14:23 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-12-06 11:14:23 -0800
commitafbd65f5e71a37fc9f46cb3e867e141a65d6ec25 (patch)
treea597cd1bcfc6816b08dbc6d7e7fea395fa61d898 /drivers/input/misc
parentMerge branch 'next' into for-linus (diff)
parentInput: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers (diff)
downloadlinux-afbd65f5e71a37fc9f46cb3e867e141a65d6ec25.tar.gz
linux-afbd65f5e71a37fc9f46cb3e867e141a65d6ec25.zip
Merge branch 'next' into for-linus
Prepare second round of updates for 5.5 merge window.
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/uinput.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 84051f20b18a..fd253781be71 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -695,7 +695,7 @@ static __poll_t uinput_poll(struct file *file, poll_table *wait)
if (udev->head != udev->tail)
return EPOLLIN | EPOLLRDNORM;
- return 0;
+ return EPOLLOUT | EPOLLWRNORM;
}
static int uinput_release(struct inode *inode, struct file *file)