backport: HID: wacom: correct misreported EKR ring values

The EKR ring claims a range of 0 to 71 but actually reports values 1 to 72. The ring is used in relative mode so this change should not affect users. Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com> Fixes: 72b236d60218f ("HID: wacom: Add support for Express Key Remote.") Cc: <stable@vger.kernel.org> # v4.3+ Reviewed-by: Ping Cheng <ping.cheng@wacom.com> Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> [aaron.skomra@wacom.com: Imported into input-wacom repository (fcf887e7caaa)] Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com> [aaron.skomra@wacom.com: Backported to input-wacom repository (de08dab)] Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
skomra · Sep 4, 2019 · e926e28 · e926e28
1 parent 7767fc5
commit e926e28
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
@@ -1055,7 +1055,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac, size_t len)
 	input_report_key(input, BTN_BASE2, (data[11] & 0x02));
 
 	if (data[12] & 0x80)
-		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f));
+		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f) - 1);
 	else
 		input_report_abs(input, ABS_WHEEL, 0);
 

diff --git a/3.17/wacom_wac.c b/3.17/wacom_wac.c
@@ -1079,7 +1079,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac, size_t len)
 	input_report_key(input, BTN_BASE2, (data[11] & 0x02));
 
 	if (data[12] & 0x80)
-		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f));
+		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f) - 1);
 	else
 		input_report_abs(input, ABS_WHEEL, 0);
 

diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
@@ -1055,7 +1055,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac, size_t len)
 	input_report_key(input, BTN_BASE2, (data[11] & 0x02));
 
 	if (data[12] & 0x80)
-		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f));
+		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f) - 1);
 	else
 		input_report_abs(input, ABS_WHEEL, 0);