The patch titled input: fix wiring up default setkeycode/setkeycodebig has been added to the -mm tree. Its filename is input-fix-wiring-up-default-setkeycode-setkeycodebig.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: input: fix wiring up default setkeycode/setkeycodebig From: Jarod Wilson <jarod@xxxxxxxxxx> I believe there's a mistake in 94977ff15f4214ee4630cf4a67195a1d48da771c, where the conditions on which to set a setkeycodebig function are incorrect. Previously, we had the case where if the dev didn't provide its own setkeycode, we'd set the default input layer one. Now, we set setkeycode big if the dev provides its own setkeycode but doesn't provide setkeycodebig. Devices that provide neither setkeycode nor setkeycodebig wind up with neither, which blows up horribly later on down the road when a setkeycode{,big} operation is attempted. Such is the case with the thinkpad_acpi driver's input device registered for the extra hotkey buttons on my own t61. This makes it happy again, and seems to be an obvious fix for a thinko. Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx> Cc: Kyle McMartin <kmcmartin@xxxxxxxxxx> Cc: Dmitry Torokhov <dtor@xxxxxxx> Tested-by: Valdis Kletnieks <Valdis.Kletnieks@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/input/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/input/input.c~input-fix-wiring-up-default-setkeycode-setkeycodebig drivers/input/input.c --- a/drivers/input/input.c~input-fix-wiring-up-default-setkeycode-setkeycodebig +++ a/drivers/input/input.c @@ -1929,7 +1929,7 @@ int input_register_device(struct input_d dev->getkeycodebig_from_scancode = input_default_getkeycode_from_scancode; } - if (dev->setkeycode) { + if (!dev->setkeycode) { if (!dev->setkeycodebig) dev->setkeycodebig = input_default_setkeycode; } _ Patches currently in -mm which might be from jarod@xxxxxxxxxx are linux-next.patch input-fix-uninitialized-old_keycode-oops-in-input_set_keycode.patch input-fix-wiring-up-default-setkeycode-setkeycodebig.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html