HID: wacom: fix bit shift for Cintiq Companion 2 (693c3dab) · Commits · 戴 / test

The bit indicating BTN_6 on this device is overshifted by 2 bits, resulting in the incorrect button being reported. Also fix copy-paste mistake in comments. Signed-off-by:

Aaron Armstrong Skomra <aaron.skomra@wacom.com> Reviewed-by:

Ping Cheng <ping.cheng@wacom.com> Link: https://github.com/linuxwacom/xf86-input-wacom/issues/71 Fixes: ("HID: wacom: Slim down wacom_intuos_pad processing") Cc: <stable@vger.kernel.org> # v4.5+ Signed-off-by:

Jiri Kosina <jkosina@suse.cz>

drivers/hid/wacom_wac.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -533,14 +533,14 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
		*/
		buttons = (data[4] << 1) \| (data[3] & 0x01);
		} else if (features->type == CINTIQ_COMPANION_2) {
		/* d-pad right -> data[4] & 0x10
		* d-pad up -> data[4] & 0x20
		* d-pad left -> data[4] & 0x40
		* d-pad down -> data[4] & 0x80
		* d-pad center -> data[3] & 0x01
		/* d-pad right -> data[2] & 0x10
		* d-pad up -> data[2] & 0x20
		* d-pad left -> data[2] & 0x40
		* d-pad down -> data[2] & 0x80
		* d-pad center -> data[1] & 0x01
		*/
		buttons = ((data[2] >> 4) << 7) \|
		((data[1] & 0x04) << 6) \|
		((data[1] & 0x04) << 4) \|
		((data[2] & 0x0F) << 2) \|
		(data[1] & 0x03);
		} else if (features->type >= INTUOS5S && features->type <= INTUOSPL) {

Admin message