The patch titled macintosh: fix fabrication of caplock key events has been added to the -mm tree. Its filename is macintosh-fix-fabrication-of-caplock-key-events.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/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: macintosh: fix fabrication of caplock key events From: Andy Wingo <wingo@xxxxxxxxx> If the user has turned on the "restore_caplock_events" parameter, the code mangles the capslock events correctly, then erroneously ignores those events. Fix logic to allow correct fallthrough. Signed-off-by: Andy Wingo <wingo@xxxxxxxxx> Cc: Andrew McNabb <amcnabb@xxxxxxxxxxx> Cc: Dmitry Torokhov <dtor@xxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> cc: Paul Mackerras <paulus@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/macintosh/adbhid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/macintosh/adbhid.c~macintosh-fix-fabrication-of-caplock-key-events drivers/macintosh/adbhid.c --- a/drivers/macintosh/adbhid.c~macintosh-fix-fabrication-of-caplock-key-events +++ a/drivers/macintosh/adbhid.c @@ -322,8 +322,9 @@ adbhid_input_keycode(int id, int scancod input_sync(ahid->input); input_report_key(ahid->input, KEY_CAPSLOCK, 0); input_sync(ahid->input); + return; } - return; + break; #ifdef CONFIG_PPC_PMAC case ADB_KEY_POWER_OLD: /* Power key on PBook 3400 needs remapping */ switch(pmac_call_feature(PMAC_FTR_GET_MB_INFO, _ Patches currently in -mm which might be from wingo@xxxxxxxxx are macintosh-fix-fabrication-of-caplock-key-events.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