Commit 9f31c05e authored Jan 14, 2008 by Andy Wingo Committed by Linus Torvalds Jan 14, 2008

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: Andy Wingo <wingo@pobox.com>
Acked-by: Andrew 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 96990a4a

drivers/macintosh/adbhid.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -322,8 +322,9 @@ adbhid_input_keycode(int id, int scancode, int repeat)
		input_sync(ahid->input);
		input_report_key(ahid->input, KEY_CAPSLOCK, 0);
		input_sync(ahid->input);
		}
		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,

Admin message