Commit:     9f31c05ea0f5690d002ae30710fc0fbe0f0c201f
Parent:     96990a4ae979df9e235d01097d6175759331e88c
Author:     Andy Wingo <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 14 00:55:15 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jan 14 08:52:22 2008 -0800

    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 <[EMAIL PROTECTED]>
    Acked-by: Andrew McNabb <[EMAIL PROTECTED]>
    Cc: Dmitry Torokhov <[EMAIL PROTECTED]>
    Cc: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
    cc: Paul Mackerras <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/macintosh/adbhid.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 883da72..ef4c117 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -322,8 +322,9 @@ adbhid_input_keycode(int id, int scancode, int repeat)
                        input_report_key(ahid->input, KEY_CAPSLOCK, 0);
+                       return;
-               return;
+               break;
        case ADB_KEY_POWER_OLD: /* Power key on PBook 3400 needs remapping */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to