Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-01-18 17:24:15 +0100
committerTakashi Iwai <tiwai@suse.de>2019-01-18 17:24:17 +0100
commit43ce511b8475f1836dc9cfe4ae0bc72fb05bd323 (patch)
tree040e9339e5661777d9ddf712118d5dff22b229ea
parent1799aff6e48bbc7d1a454648273766087343e651 (diff)
Input: restore EV_ABS ABS_RESERVED (bsc#1051510).
-rw-r--r--patches.drivers/Input-restore-EV_ABS-ABS_RESERVED.patch45
-rw-r--r--series.conf1
2 files changed, 46 insertions, 0 deletions
diff --git a/patches.drivers/Input-restore-EV_ABS-ABS_RESERVED.patch b/patches.drivers/Input-restore-EV_ABS-ABS_RESERVED.patch
new file mode 100644
index 0000000000..b8cc77a3a8
--- /dev/null
+++ b/patches.drivers/Input-restore-EV_ABS-ABS_RESERVED.patch
@@ -0,0 +1,45 @@
+From c201e3808e0e4be9b98d192802085a9f491bd80c Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu, 6 Dec 2018 09:03:36 +1000
+Subject: [PATCH] Input: restore EV_ABS ABS_RESERVED
+Git-commit: c201e3808e0e4be9b98d192802085a9f491bd80c
+Patch-mainline: v4.20-rc7
+References: bsc#1051510
+
+ABS_RESERVED was added in d9ca1c990a7 and accidentally removed as part of
+ffe0e7cf290f5c9 when the high-resolution scrolling code was removed.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Reviewed-by: Martin Kepplinger <martin.kepplinger@ginzinger.com>
+Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ include/uapi/linux/input-event-codes.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
+index 3eb5a4c3d60a..ae366b87426a 100644
+--- a/include/uapi/linux/input-event-codes.h
++++ b/include/uapi/linux/input-event-codes.h
+@@ -752,6 +752,15 @@
+
+ #define ABS_MISC 0x28
+
++/*
++ * 0x2e is reserved and should not be used in input drivers.
++ * It was used by HID as ABS_MISC+6 and userspace needs to detect if
++ * the next ABS_* event is correct or is just ABS_MISC + n.
++ * We define here ABS_RESERVED so userspace can rely on it and detect
++ * the situation described above.
++ */
++#define ABS_RESERVED 0x2e
++
+ #define ABS_MT_SLOT 0x2f /* MT slot being modified */
+ #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */
+ #define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index d6ea8c3435..0c2542b56e 100644
--- a/series.conf
+++ b/series.conf
@@ -19565,6 +19565,7 @@
patches.drivers/mac80211-fix-reordering-of-buffered-broadcast-packet.patch
patches.drivers/mac80211-ignore-NullFunc-frames-in-the-duplicate-det.patch
patches.drivers/net-mlx4_core-Correctly-set-PFC-param-if-global-paus.patch
+ patches.drivers/Input-restore-EV_ABS-ABS_RESERVED.patch
patches.drivers/ALSA-hda-realtek-Fixed-headphone-issue-for-ALC700.patch
patches.drivers/ALSA-hda-realtek-Fix-the-mute-LED-regresion-on-Lenov.patch
patches.drivers/ALSA-fireface-fix-reference-to-wrong-register-for-cl.patch