hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

Fixes: c7f0522 ("HID: wacom: Slim down wacom_intuos_pad processing")

Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
Tested-by: Matthieu Robin <matthieu@macolu.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Ping Cheng 2017-08-31 15:50:03 -07:00 committed by Jiri Kosina
parent b42a362e6d
commit ce06760ba4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hid/wacom_wac.c
View File

@ -567,8 +567,8 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
keys = data[9] & 0x07; keys = data[9] & 0x07;
} }
} else { } else {
buttons = ((data[6] & 0x10) << 10) | buttons = ((data[6] & 0x10) << 5) |
((data[5] & 0x10) << 9) | ((data[5] & 0x10) << 4) |
((data[6] & 0x0F) << 4) | ((data[6] & 0x0F) << 4) |
(data[5] & 0x0F); (data[5] & 0x0F);
} }