summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-04-25 10:31:21 +0200
committerHans de Goede <hdegoede@redhat.com>2014-04-25 10:33:02 +0200
commita41e4a9198f90fd7d8f19964985159fe00f2b5aa (patch)
tree3871d2e30ebe38d2463046c56b662f738a9a9e2e
parent96eedb89184a7aaef61d06c0506a579b3a923006 (diff)
downloadkernel-a41e4a9198f90fd7d8f19964985159fe00f2b5aa.tar.gz
kernel-a41e4a9198f90fd7d8f19964985159fe00f2b5aa.tar.xz
kernel-a41e4a9198f90fd7d8f19964985159fe00f2b5aa.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.spec8
2 files changed, 41 insertions, 0 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 00000000..03527a56
--- /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 c60e8aeb..1020bbc1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -739,6 +739,8 @@ Patch25064: 0001-HID-rmi-do-not-handle-touchscreens-through-hid-rmi.patch
#rhbz 1013466
Patch25065: selinux-put-the-mmap-DAC-controls-before-the-MAC-controls.patch
+#rhbz 1089689
+Patch25066: 0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
# END OF PATCH DEFINITIONS
@@ -1433,6 +1435,9 @@ ApplyPatch USB-serial-ftdi_sio-add-id-for-Brainboxes-serial-car.patch
#rhbz 1013466
ApplyPatch selinux-put-the-mmap-DAC-controls-before-the-MAC-controls.patch
+#rhbz 1089689
+ApplyPatch 0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2244,6 +2249,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)
+
* Wed Apr 23 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Fix SELinux wine issue again (rhbz 1013466)