diff options
author | Paul Mackerras <paulus@samba.org> | 2008-01-24 00:07:21 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-01-24 00:07:21 +0100 |
commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /drivers/macintosh | |
parent | [POWERPC] Provide a way to protect 4k subpages when using 64k pages (diff) | |
parent | Update ctime and mtime for memory-mapped files (diff) | |
download | linux-9156ad48338e0306e508ead5c0d9986050744475.tar.xz linux-9156ad48338e0306e508ead5c0d9986050744475.zip |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | 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 883da72b5368..ef4c117ea35f 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_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, |