diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-04-23 16:50:35 +1000 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-04-23 20:39:51 -0400 |
| commit | 49fd71050470b5a5a380f38b6dcf02a13b688622 (patch) | |
| tree | 6511820c7ffa5ffcd473cb068ae9e94c4b078060 | |
| parent | fc272f656da35fb37e45851784b07415bd03865f (diff) | |
| download | kernel-49fd71050470b5a5a380f38b6dcf02a13b688622.tar.gz kernel-49fd71050470b5a5a380f38b6dcf02a13b688622.tar.xz kernel-49fd71050470b5a5a380f38b6dcf02a13b688622.zip | |
Fix regression on clickpads
| -rw-r--r-- | input-synaptics-fix-regression-with-image-sensor-trackpads.patch | 38 | ||||
| -rw-r--r-- | kernel.spec | 9 |
2 files changed, 46 insertions, 1 deletions
diff --git a/input-synaptics-fix-regression-with-image-sensor-trackpads.patch b/input-synaptics-fix-regression-with-image-sensor-trackpads.patch new file mode 100644 index 000000000..6c1542b7c --- /dev/null +++ b/input-synaptics-fix-regression-with-image-sensor-trackpads.patch @@ -0,0 +1,38 @@ +From 899c612d74d4a242158a4db20367388d6299c028 Mon Sep 17 00:00:00 2001 +From: Benjamin Herrenschmidt <benh@kernel.crashing.org> +Date: Fri, 20 Apr 2012 22:34:49 -0700 +Subject: [PATCH] Input: synaptics - fix regression with "image sensor" + trackpads + +commit 7968a5dd492ccc38345013e534ad4c8d6eb60ed1 +Input: synaptics - add support for Relative mode + +Accidentally broke support for advanced gestures (multitouch) +on some trackpads such as the one in my ThinkPad X220 by +incorretly changing the condition for enabling them. This +restores it. + +Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> +CC: stable@kernel.org [3.3] +Signed-off-by: Dmitry Torokhov <dtor@mail.ru> +--- + drivers/input/mouse/synaptics.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c +index 8081a0a..a4b14a4 100644 +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -274,7 +274,8 @@ static int synaptics_set_advanced_gesture_mode(struct psmouse *psmouse) + static unsigned char param = 0xc8; + struct synaptics_data *priv = psmouse->private; + +- if (!SYN_CAP_ADV_GESTURE(priv->ext_cap_0c)) ++ if (!(SYN_CAP_ADV_GESTURE(priv->ext_cap_0c) || ++ SYN_CAP_IMAGE_SENSOR(priv->ext_cap_0c))) + return 0; + + if (psmouse_sliced_command(psmouse, SYN_QUE_MODEL)) +-- +1.7.10 + diff --git a/kernel.spec b/kernel.spec index f5b2d81e7..bab6fc5ec 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -752,6 +752,8 @@ Patch22001: selinux-apply-different-permission-to-ptrace-child.patch #rhbz 814278 814289 CVE-2012-2119 Patch22007: macvtap-zerocopy-validate-vector-length.patch +Patch22011: input-synaptics-fix-regression-with-image-sensor-trackpads.patch + # END OF PATCH DEFINITIONS %endif @@ -1453,6 +1455,8 @@ ApplyPatch x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPU #rhbz 814278 814289 CVE-2012-2119 ApplyPatch macvtap-zerocopy-validate-vector-length.patch +ApplyPatch input-synaptics-fix-regression-with-image-sensor-trackpads.patch + # END OF PATCH APPLICATIONS %endif @@ -2323,6 +2327,9 @@ fi # ||----w | # || || %changelog +* Mon Apr 23 2012 Peter Hutterer <peter.hutterer@redhat.com> +- Fix regression on clickpads + * Mon Apr 23 2012 Josh Boyer <jwboyer@gmail.com> - 3.4.0-0.rc4.git0.2 - Add GMA3600 (Cedarview) support (rhbz 810686) - Reenable debugging options. |