Skip to content

Commit

Permalink
HID: wacom: Fix ABS_MISC reporting for Cintiq Companion 2
Browse files Browse the repository at this point in the history
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 <jason.gerecke@wacom.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Jason Gerecke authored and Jiri Kosina committed Nov 3, 2015
1 parent 6212aae commit 8253d42
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/hid/wacom_wac.c
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
input_report_key(input, BTN_A, (data[2] & 0x80)); /* Down */
input_report_key(input, BTN_0, (data[1] & 0x01)); /* Center */

if (data[4] | (data[3] & 0x01)) {
if (data[2] | (data[1] & 0x07)) {
input_report_abs(input, ABS_MISC, PAD_DEVICE_ID);
} else {
input_report_abs(input, ABS_MISC, 0);
Expand Down

0 comments on commit 8253d42

Please sign in to comment.