mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
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:
parent
b42a362e6d
commit
ce06760ba4
1 changed files with 2 additions and 2 deletions
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue