Home Home > GIT Browse > SLE12-SP5-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2019-08-21 12:47:31 +0200
committerOliver Neukum <oneukum@suse.com>2019-08-21 12:47:31 +0200
commitfff2c8e7a6a33e160df4be538aebe58c98567005 (patch)
treebb4044928e47c9ec26d79e781c0fbc652229d225
parent938b6bc80d2ee3262fdc6dc1f677239f1dbb29c2 (diff)
HID: wacom: correct misreported EKR ring values (bsc#1142635).
-rw-r--r--patches.fixes/0001-HID-wacom-correct-misreported-EKR-ring-values.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.fixes/0001-HID-wacom-correct-misreported-EKR-ring-values.patch b/patches.fixes/0001-HID-wacom-correct-misreported-EKR-ring-values.patch
new file mode 100644
index 0000000000..4c351fa9dc
--- /dev/null
+++ b/patches.fixes/0001-HID-wacom-correct-misreported-EKR-ring-values.patch
@@ -0,0 +1,39 @@
+From fcf887e7caaa813eea821d11bf2b7619a37df37a Mon Sep 17 00:00:00 2001
+From: Aaron Armstrong Skomra <skomra@gmail.com>
+Date: Fri, 16 Aug 2019 12:00:54 -0700
+Subject: [PATCH] HID: wacom: correct misreported EKR ring values
+Git-commit: fcf887e7caaa813eea821d11bf2b7619a37df37a
+Patch-mainline: v5.3-rc5
+References: bsc#1142635
+
+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>
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+---
+ drivers/hid/wacom_wac.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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);
+
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index c82b373870..182a021d62 100644
--- a/series.conf
+++ b/series.conf
@@ -23417,6 +23417,7 @@
patches.fixes/0001-USB-CDC-fix-sanity-checks-in-CDC-union-parser.patch
patches.drivers/ibmvnic-Unmap-DMA-address-of-TX-descriptor-buffers-a.patch
patches.fixes/0001-HID-wacom-Correct-distance-scale-for-2nd-gen-Intuos-.patch
+ patches.fixes/0001-HID-wacom-correct-misreported-EKR-ring-values.patch
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch