lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix adbhid mismerge

Browse Source 
This fixes a lost 'key' variable declaration that went missing in a
mismerge (commit b981d8b3f5)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro
2007-10-17 01:02:46 +01:00
committed by Linus Torvalds
parent 2b0460b534
commit 68f3e6622b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/macintosh/adbhid.c
View File

@@ -282,7 +282,7 @@ static void
adbhid_input_keycode(int id, int scancode, int repeat) adbhid_input_keycode(int id, int scancode, int repeat)
{ {
struct adbhid *ahid = adbhid[id]; struct adbhid *ahid = adbhid[id];
int keycode, up_flag; int keycode, up_flag, key;
keycode = scancode & 0x7f; keycode = scancode & 0x7f;
up_flag = scancode & 0x80; up_flag = scancode & 0x80;