Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-21 09:11:55 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-21 09:12:04 +0100
commit701686778a52b3e34ea4fdce0105e30b28006a33 (patch)
tree6ed91638abb3171cee204647f54e818fa8939572
parentc74480a08d07c2156443313c8c01769b570e2dce (diff)
Revert "Input: elan_i2c - add ACPI ID for touchpad in ASUS
Aspire F5-573G" (bsc#1051510).
-rw-r--r--patches.drivers/Revert-Input-elan_i2c-add-ACPI-ID-for-touchpad-in-AS.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.drivers/Revert-Input-elan_i2c-add-ACPI-ID-for-touchpad-in-AS.patch b/patches.drivers/Revert-Input-elan_i2c-add-ACPI-ID-for-touchpad-in-AS.patch
new file mode 100644
index 0000000000..d73857ef5d
--- /dev/null
+++ b/patches.drivers/Revert-Input-elan_i2c-add-ACPI-ID-for-touchpad-in-AS.patch
@@ -0,0 +1,38 @@
+From f420c54e4b12c1361c6ed313002ee7bd7ac58362 Mon Sep 17 00:00:00 2001
+From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Date: Mon, 11 Feb 2019 14:32:40 -0800
+Subject: [PATCH] Revert "Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G"
+Git-commit: f420c54e4b12c1361c6ed313002ee7bd7ac58362
+Patch-mainline: v5.0-rc7
+References: bsc#1051510
+
+This reverts commit 7db54c89f0b30a101584e09d3729144e6170059d as it
+breaks Acer Aspire V-371 and other devices. According to Elan:
+
+"Acer Aspire F5-573G is MS Precision touchpad which should use hid
+ multitouch driver. ELAN0501 should not be added in elan_i2c."
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202503
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/input/mouse/elan_i2c_core.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
+index f322a1768fbb..a94b6494e71a 100644
+--- a/drivers/input/mouse/elan_i2c_core.c
++++ b/drivers/input/mouse/elan_i2c_core.c
+@@ -1336,7 +1336,6 @@ MODULE_DEVICE_TABLE(i2c, elan_id);
+ static const struct acpi_device_id elan_acpi_id[] = {
+ { "ELAN0000", 0 },
+ { "ELAN0100", 0 },
+- { "ELAN0501", 0 },
+ { "ELAN0600", 0 },
+ { "ELAN0602", 0 },
+ { "ELAN0605", 0 },
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 305febbbd2..253c3fbfeb 100644
--- a/series.conf
+++ b/series.conf
@@ -20392,6 +20392,7 @@
patches.drivers/floppy-check_events-callback-should-not-return-a-neg.patch
patches.drivers/Input-bma150-register-input-device-after-setting-pri.patch
patches.drivers/Input-elantech-enable-3rd-button-support-on-Fujitsu-.patch
+ patches.drivers/Revert-Input-elan_i2c-add-ACPI-ID-for-touchpad-in-AS.patch
patches.drivers/i2c-cadence-Fix-the-hold-bit-setting.patch
patches.drivers/i2c-bcm2835-Clear-current-buffer-pointers-and-counts.patch
patches.fixes/mac80211-Restore-vif-beacon-interval-if-start-ap-fai.patch