summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Armstrong Skomra2019-08-16 21:00:54 +0200
committerJiri Kosina2019-08-20 10:40:40 +0200
commitfcf887e7caaa813eea821d11bf2b7619a37df37a (patch)
treee9485b793effc55f001d4f5837bd08216d9e22b1
parentHID: cp2112: prevent sleeping function called from invalid context (diff)
downloadkernel-qcow2-linux-fcf887e7caaa813eea821d11bf2b7619a37df37a.tar.gz
kernel-qcow2-linux-fcf887e7caaa813eea821d11bf2b7619a37df37a.tar.xz
kernel-qcow2-linux-fcf887e7caaa813eea821d11bf2b7619a37df37a.zip
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>
-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 7a9e229e6253..1713235d28cb 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -1061,7 +1061,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);