提交 68f3e662 编写于 作者: A Al Viro 提交者: Linus Torvalds

fix adbhid mismerge

This fixes a lost 'key' variable declaration that went missing in a
mismerge (commit b981d8b3)
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 2b0460b5
...@@ -282,7 +282,7 @@ static void ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册