From 11834d2d28b4f620737e58bbcfc2cdc2d0910fe4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 23 Apr 2012 16:50:35 +1000 Subject: [PATCH] Fix regression on clickpads --- ...gression-with-image-sensor-trackpads.patch | 38 +++++++++++++++++++ kernel.spec | 9 ++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 input-synaptics-fix-regression-with-image-sensor-trackpads.patch 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 +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 +CC: stable@kernel.org [3.3] +Signed-off-by: Dmitry Torokhov +--- + 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 115d721c9..4c130659d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ Summary: The Linux kernel # When changing real_sublevel below, reset this by hand to 1 # (or to 0 and then use rpmdev-bumpspec). # -%global baserelease 6 +%global baserelease 7 %global fedora_build %{baserelease} # real_sublevel is the 3.x kernel version we're starting with @@ -726,6 +726,8 @@ Patch22009: security-fix-compile-error-in-commoncap.c.patch #rhbz 811225 Patch22010: memblock-memblock-should-be-able-to-handle-zero-leng.patch +Patch22011: input-synaptics-fix-regression-with-image-sensor-trackpads.patch + # END OF PATCH DEFINITIONS %endif @@ -1345,6 +1347,8 @@ ApplyPatch security-fix-compile-error-in-commoncap.c.patch #rhbz 811225 ApplyPatch memblock-memblock-should-be-able-to-handle-zero-leng.patch +ApplyPatch input-synaptics-fix-regression-with-image-sensor-trackpads.patch + # END OF PATCH APPLICATIONS %endif @@ -1997,6 +2001,9 @@ fi # and build. %changelog +* Mon Apr 23 2012 Peter Hutterer +- Fix regression on clickpads + * Sat Apr 21 2012 Josh Boyer - 2.6.43.2-6 - Fix error check in memblock that prevented boot on various Dells (rhbz 811225)