Merge lp:~sforshee/udev/keymap-continue-read-after-invalid-scancode into lp:udev

[Seth Forshee]

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.

[Martin Pitt (pitti)]

Thanks!

lp:udev is an automatic import from upstream git, I can't merge into it directly. I extracted the patch and applied it to upstream git, thanks!

review: Approve

[Martin Pitt (pitti)]

Unfortunately I cannot change the status of this, can you please set it to "merged"?

[Seth Forshee (sforshee)]

Okay, set status to merged.

If this can't be merged directly, is doing the merge request through launchpad the right way to submit changes, or should I be doing it some other way?

[Martin Pitt (pitti)]

If you prefer working in bzr, it is certainly a working way. It's about the same effort as attaching a patch to a bug report (except that I can't modify the status of non-Ubuntu merge proposals).

The best/canonical way would be to supply format-patches or branches against the upstream branch, which is http://git.kernel.org/?p=linux/hotplug/udev.git in this case, and attach them to bugs or send a mail to <email address hidden>.

[Seth Forshee (sforshee)]

Well, being a kernel guy I'm way more comfortable with git, so I'll do it that way in the future!

=== modified file 'extras/keymap/keymap.c'
--- extras/keymap/keymap.c	2011-01-16 20:12:32 +0000
+++ extras/keymap/keymap.c	2011-03-23 17:04:29 +0000
@@ -141,8 +141,9 @@
 		int keycode;
 
 		if ((keycode = evdev_get_keycode(fd, scancode, 1)) < 0) {
-			if (keycode != -2)
-				r = -1;
+			if (keycode == -2)
+				continue;
+			r = -1;
 			break;
 		}