Skip to content

Commit 8253d42

Browse files
jigpuJiri Kosina
authored andcommitted
HID: wacom: Fix ABS_MISC reporting for Cintiq Companion 2
The pad handling code introduced for the Cintiq Companion 2 (f7acb55) looks at the wrong bytes in the report when deciding whether ABS_MISC should be sent. This does not cause any issues with the X driver now that the pen and pad have been split to separate devices, but is incorrect and has caused issues when backporting to distros with pre- 3.17 kernels. Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 6212aae commit 8253d42

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/hid/wacom_wac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
966966
input_report_key(input, BTN_A, (data[2] & 0x80)); /* Down */
967967
input_report_key(input, BTN_0, (data[1] & 0x01)); /* Center */
968968

969-
if (data[4] | (data[3] & 0x01)) {
969+
if (data[2] | (data[1] & 0x07)) {
970970
input_report_abs(input, ABS_MISC, PAD_DEVICE_ID);
971971
} else {
972972
input_report_abs(input, ABS_MISC, 0);

0 commit comments

Comments
 (0)