Commit c7f0522 accidentally used ABS_RX for reporting both 'strip1' and
'strip2', when the latter should actually be reported through ABS_RY.
NOTE: This patch was backported earlier, but only as far back as 2.6.38.
To make backporting the next few patches easier, we complete this backport
all the way to 2.6.30.
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
Signed-off-by: Jiri Kosina <jkos...@suse.cz>
[jason.gere...@wacom.com: Imported into input-wacom repository (03a0dc5)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
[jason.gere...@wacom.com: backported from input-wacom 6f348a8]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
[jason.gere...@wacom.com: backported from input-wacom (7ffef75)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
2.6.30/wacom_wac.c | 2 +-
2.6.36/wacom_wac.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 81a78fa..008b0a6 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -748,7 +748,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);
diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
index 7eb0d1e..a39aa57 100644
--- a/2.6.36/wacom_wac.c
+++ b/2.6.36/wacom_wac.c
@@ -546,7 +546,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);
--
2.10.2
------------------------------------------------------------------------------
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
