summaryrefslogtreecommitdiffstats
path: root/drivers/input/evdev.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2018-10-12 12:35:02 +0200
committerGreg Kroah-Hartman2018-10-12 12:35:02 +0200
commiteb81bfb224ced3701bcc7b08f309665bf0549252 (patch)
treee8e148c679517b0da74d82660a55444adcd32bc2 /drivers/input/evdev.c
parentMerge tag 'next-fixes-20181012' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentInput: uinput - add a schedule point in uinput_inject_events() (diff)
downloadkernel-qcow2-linux-eb81bfb224ced3701bcc7b08f309665bf0549252.tar.gz
kernel-qcow2-linux-eb81bfb224ced3701bcc7b08f309665bf0549252.tar.xz
kernel-qcow2-linux-eb81bfb224ced3701bcc7b08f309665bf0549252.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Dmitry writes: "Input updates for v4.19-rc7 - we added a few scheduling points into various input interfaces to ensure that large writes will not cause RCU stalls - fixed configuring PS/2 keyboards as wakeup devices on newer platforms - added a new Xbox gamepad ID." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: uinput - add a schedule point in uinput_inject_events() Input: evdev - add a schedule point in evdev_write() Input: mousedev - add a schedule point in mousedev_write() Input: i8042 - enable keyboard wakeups by default when s2idle is used Input: xpad - add support for Xbox1 PDP Camo series gamepad
Diffstat (limited to 'drivers/input/evdev.c')
-rw-r--r--drivers/input/evdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 370206f987f9..f48369d6f3a0 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -564,6 +564,7 @@ static ssize_t evdev_write(struct file *file, const char __user *buffer,
input_inject_event(&evdev->handle,
event.type, event.code, event.value);
+ cond_resched();
}
out: