Commit 9f31c05e authored by Andy Wingo's avatar Andy Wingo Committed by Linus Torvalds

macintosh: fix fabrication of caplock key events

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: default avatarAndy Wingo <wingo@pobox.com>
Acked-by: default avatarAndrew McNabb <amcnabb@mcnabbs.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 96990a4a
...@@ -322,8 +322,9 @@ adbhid_input_keycode(int id, int scancode, int repeat) ...@@ -322,8 +322,9 @@ adbhid_input_keycode(int id, int scancode, int repeat)
input_sync(ahid->input); input_sync(ahid->input);
input_report_key(ahid->input, KEY_CAPSLOCK, 0); input_report_key(ahid->input, KEY_CAPSLOCK, 0);
input_sync(ahid->input); input_sync(ahid->input);
}
return; return;
}
break;
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
case ADB_KEY_POWER_OLD: /* Power key on PBook 3400 needs remapping */ case ADB_KEY_POWER_OLD: /* Power key on PBook 3400 needs remapping */
switch(pmac_call_feature(PMAC_FTR_GET_MB_INFO, switch(pmac_call_feature(PMAC_FTR_GET_MB_INFO,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment