Commit 50b27486 authored by Ping Cheng's avatar Ping Cheng Committed by Greg Kroah-Hartman

HID: wacom: bits shifted too much for 9th and 10th buttons

commit ce06760b upstream.

Cintiq 12 has 10 expresskey buttons. The bit shift for the last
two buttons were off by 5.

Fixes: c7f0522a ("HID: wacom: Slim down wacom_intuos_pad processing")
Signed-off-by: default avatarPing Cheng <ping.cheng@wacom.com>
Tested-by: default avatarMatthieu Robin <matthieu@macolu.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Cc: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 953f5e7c
......@@ -559,8 +559,8 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
keys = data[9] & 0x07;
}
} else {
buttons = ((data[6] & 0x10) << 10) |
((data[5] & 0x10) << 9) |
buttons = ((data[6] & 0x10) << 5) |
((data[5] & 0x10) << 4) |
((data[6] & 0x0F) << 4) |
(data[5] & 0x0F);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment