HID: wacom: bits shifted too much for 9th and 10th buttons
authorPing Cheng <pinglinux@gmail.com>
Thu, 31 Aug 2017 22:50:03 +0000 (15:50 -0700)
committerJiri Kosina <jkosina@suse.cz>
Wed, 6 Sep 2017 08:46:45 +0000 (10:46 +0200)
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>
drivers/hid/wacom_wac.c

index bb17d7bbefd3e7bf033344e7e1bc6b5d5228fd27..f8ddcaaa2ac6956bed87778e60d19b4925550a61 100644 (file)
@@ -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);
                }