From 641842bce295ec17cca52d34cfaa6765e097bb18 Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Thu, 24 Mar 2011 16:33:54 +0100 Subject: keymap: continue reading keymap after invalid scancodes Reading of keymaps is aborted when EINVAL is returned from EVIOCGETKEYCODE. Scan codes are not always continuous ranges of values starting at 0, so this can result in not getting the full keymap for a device. Instead, continue processing if EINVAL is returned. --- extras/keymap/keymap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'extras/keymap') diff --git a/extras/keymap/keymap.c b/extras/keymap/keymap.c index 719c30e600..eabd1e44d8 100644 --- a/extras/keymap/keymap.c +++ b/extras/keymap/keymap.c @@ -141,8 +141,9 @@ static int dump_table(int fd) { int keycode; if ((keycode = evdev_get_keycode(fd, scancode, 1)) < 0) { - if (keycode != -2) - r = -1; + if (keycode == -2) + continue; + r = -1; break; } -- cgit v1.2.3-54-g00ecf