diff options
| author | Ping Cheng <pinglinux@gmail.com> | 2017-09-01 01:50:03 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-06 11:46:45 +0300 |
| commit | ce06760ba46b66dae50f2519ae76bd15e89b5710 (patch) | |
| tree | fb3563942ffea95e3671ebb175a0ddf8d9f4d44c /drivers/hid/wacom_wac.c | |
| parent | b42a362e6d10c342004b183defcb9940331b6737 (diff) | |
| download | linux-ce06760ba46b66dae50f2519ae76bd15e89b5710.tar.xz | |
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>
Diffstat (limited to 'drivers/hid/wacom_wac.c')
| -rw-r--r-- | drivers/hid/wacom_wac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index bb17d7bbefd3..f8ddcaaa2ac6 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -567,8 +567,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); } |