summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-04-25 10:44:10 +0200
committerHans de Goede <hdegoede@redhat.com>2014-04-25 10:44:10 +0200
commit38d8cd2ec1088b1ea6afe3520826405f20e9adcb (patch)
treef9ff9094d5b6273e90af6537306bff41027d4b34
parent59b99b600c8f39d311ba474a22ffa41c61971200 (diff)
downloadkernel-38d8cd2ec1088b1ea6afe3520826405f20e9adcb.tar.gz
kernel-38d8cd2ec1088b1ea6afe3520826405f20e9adcb.tar.xz
kernel-38d8cd2ec1088b1ea6afe3520826405f20e9adcb.zip
Add synaptics min-max quirk for ThinkPad Edge E431 (rhbz#1089689)
-rw-r--r--0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch33
-rw-r--r--kernel.spec11
2 files changed, 43 insertions, 1 deletions
diff --git a/0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch b/0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
new file mode 100644
index 000000000..03527a568
--- /dev/null
+++ b/0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
@@ -0,0 +1,33 @@
+From d1b9785eda70e7638927d294139c6d4796cb7ea6 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 22 Apr 2014 11:08:16 +0200
+Subject: [PATCH v3] synaptics: Add min/max quirk for ThinkPad Edge E431
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/input/mouse/synaptics.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index 7c9f509..93cc8fd 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -1566,6 +1566,14 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = {
+ .driver_data = (int []){1232, 5710, 1156, 4696},
+ },
+ {
++ /* Lenovo ThinkPad Edge E431 */
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad Edge E431"),
++ },
++ .driver_data = (int []){1024, 5022, 2508, 4832},
++ },
++ {
+ /* Lenovo ThinkPad T431s */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+--
+1.9.0
+
diff --git a/kernel.spec b/kernel.spec
index 4de531ad2..f882411b6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -714,9 +714,12 @@ Patch25055: lib-percpu_counter.c-fix-bad-percpu-counter-state-du.patch
#CVE-2014-2851 rhbz 1086730 1087420
Patch25059: net-ipv4-current-group_info-should-be-put-after-using.patch
-#rhbz 1085582 1085697
+#rhbz 1085582 1085697 1088588
Patch25060: 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch
+#rhbz 1089689
+Patch25061: 0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1399,6 +1402,9 @@ ApplyPatch net-ipv4-current-group_info-should-be-put-after-using.patch
#rhbz 1085582 1085697
ApplyPatch 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch
+#rhbz 1089689
+ApplyPatch 0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2211,6 +2217,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Apr 25 2014 Hans de Goede <hdegoede@redhat.com>
+- Add synaptics min-max quirk for ThinkPad Edge E431 (rhbz#1089689)
+
* Thu Apr 17 2014 Hans de Goede <hdegoede@redhat.com>
- Update min/max quirk patch to add a quirk for the ThinkPad L540 (rhbz1088588)