diff options
| author |   Jason Gerecke <killertofu@gmail.com> | 2015-11-02 15:41:13 -0800 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2015-11-03 14:36:23 +0100 |
| commit | 8253d42be8ae8c81cabcf678448c09a69d4f3b8c (patch) | |
| tree | ec4ff5712b56cee29d37ea5398c9d10ab1d63458 /drivers/hid | |
| parent | HID: wacom: Remove useless conditions from 'wacom_query_tablet_data' (diff) | |
| download | linux-dev-8253d42be8ae8c81cabcf678448c09a69d4f3b8c.tar.xz linux-dev-8253d42be8ae8c81cabcf678448c09a69d4f3b8c.zip | |
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 <jason.gerecke@wacom.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/wacom_wac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 453da6d5c583..9db6a8b1150c 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -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); |