]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
HID: wacom: Correct button numbering 2nd-gen Intuos Pro over Bluetooth
authorJason Gerecke <jason.gerecke@wacom.com>
Tue, 7 May 2019 18:53:21 +0000 (11:53 -0700)
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>
Fri, 17 May 2019 16:21:48 +0000 (18:21 +0200)
commit6441fc781c344df61402be1fde582c4491fa35fa
treeed207eb20881031497104b0bb02660a88f8a3baa
parentfe7f8d73d1af19b678171170e4e5384deb57833d
HID: wacom: Correct button numbering 2nd-gen Intuos Pro over Bluetooth

The button numbering of the 2nd-gen Intuos Pro is not consistent between
the USB and Bluetooth interfaces. Over USB, the HID_GENERIC codepath
enumerates the eight ExpressKeys first (BTN_0 - BTN_7) followed by the
center modeswitch button (BTN_8). The Bluetooth codepath, however, has
the center modeswitch button as BTN_0 and the the eight ExpressKeys as
BTN_1 - BTN_8. To ensure userspace button mappings do not change
depending on how the tablet is connected, modify the Bluetooth codepath
to report buttons in the same order as USB.

To ensure the mode switch LED continues to toggle in response to the
mode switch button, the `wacom_is_led_toggled` function also requires
a small update.

Link: https://github.com/linuxwacom/input-wacom/pull/79
Fixes: 4922cd26f03c ("HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic interface")
Cc: <stable@vger.kernel.org> # 4.11+
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Aaron Skomra <aaron.skomra@wacom.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
drivers/hid/wacom_wac.c