summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2015-12-16 22:37:34 +0100
committerJiri Kosina <jkosina@suse.cz>2015-12-18 00:03:06 +0100
commit03a0dc546be3fa6091214bd2c05d678d3e8d67df (patch)
tree5601354b9f7858cd914b23a83c5852a41b4cfa58 /drivers/hid
parentHID: wacom: Limit touchstrip data to 13 bits (diff)
downloadlinux-03a0dc546be3fa6091214bd2c05d678d3e8d67df.tar.xz
linux-03a0dc546be3fa6091214bd2c05d678d3e8d67df.zip
HID: wacom: Report 'strip2' values in ABS_RY
Commit c7f0522 accidentally used ABS_RX for reporting both 'strip1' and 'strip2', when the latter should actually be reported through ABS_RY. Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/wacom_wac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index cf878106f4ed..94dffde5f3d5 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -558,7 +558,7 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
input_report_key(input, KEY_PROG1 + i, keys & (1 << i));
input_report_abs(input, ABS_RX, strip1);
- input_report_abs(input, ABS_RX, strip2);
+ input_report_abs(input, ABS_RY, strip2);
input_report_abs(input, ABS_WHEEL, ring1 & 0x7f ? ring1 : 0);
input_report_abs(input, ABS_THROTTLE, ring2 & 0x07 ? ring2 : 0);