summaryrefslogtreecommitdiffstats
path: root/sys/dev/evdev/evdev_utils.c
diff options
context:
space:
mode:
authorgonzo <gonzo@FreeBSD.org>2017-05-08 22:35:15 +0000
committergonzo <gonzo@FreeBSD.org>2017-05-08 22:35:15 +0000
commit77f8ce302c5d226ed581cfe840c88520820d18b2 (patch)
treef0ff2dd0d45ac5ec2c2689cbe29c4eed7f819a50 /sys/dev/evdev/evdev_utils.c
parentaeeaaf0e44802c054896bc1d1a8ba6749537eb69 (diff)
downloadFreeBSD-src-77f8ce302c5d226ed581cfe840c88520820d18b2.zip
FreeBSD-src-77f8ce302c5d226ed581cfe840c88520820d18b2.tar.gz
MFC r315176-r315178
r315176: [evdev] Do not ignore result evdev_register in UI_DEV_CREATE handler Make sure that uinput state field reflects actual state by checking evdev_register result for errors Submitted by: Vladimir Kondratiev <wulf@cicgroup.ru> Differential Revision: https://reviews.freebsd.org/D9320 r315177: [evdev] Fix race condition between client's event queue reading and dropping Submitted by: Vladimir Kondratiev <wulf@cicgroup.ru> Differential Revision: https://reviews.freebsd.org/D9320 r315178: [evdev] Fix Right Alt and Keypad Enter event codes for atkbd(4) and kbdmux(4) drivers Submitted by: Vladimir Kondratiev <wulf@cicgroup.ru> Differential Revision: https://reviews.freebsd.org/D9320
Diffstat (limited to 'sys/dev/evdev/evdev_utils.c')
-rw-r--r--sys/dev/evdev/evdev_utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/evdev/evdev_utils.c b/sys/dev/evdev/evdev_utils.c
index d78e392..5436ab5 100644
--- a/sys/dev/evdev/evdev_utils.c
+++ b/sys/dev/evdev/evdev_utils.c
@@ -159,7 +159,7 @@ static uint16_t evdev_at_set1_scancodes[] = {
KEY_PREVIOUSSONG, NONE, NONE, NONE,
NONE, NONE, NONE, NONE,
NONE, KEY_NEXTSONG, NONE, NONE,
- NONE, KEY_KPENTER, KEY_RIGHTCTRL, NONE,
+ KEY_KPENTER, KEY_RIGHTCTRL, NONE, NONE,
/* 0x20 - 0x3f. 0xE0 prefixed */
KEY_MUTE, KEY_CALC, KEY_PLAYPAUSE, NONE,
KEY_STOPCD, NONE, NONE, NONE,
OpenPOWER on IntegriCloud