From: Greg Kroah-Hartman Date: Mon, 30 Apr 2012 20:44:29 +0000 (-0400) Subject: 3.3-stable patches X-Git-Tag: v3.3.5~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23e2dd90ee63543bd3aa8da1dbfeaf3893eadfc6;p=thirdparty%2Fkernel%2Fstable-queue.git 3.3-stable patches added patches: input-synaptics-fix-regression-with-image-sensor-trackpads.patch --- diff --git a/queue-3.3/input-synaptics-fix-regression-with-image-sensor-trackpads.patch b/queue-3.3/input-synaptics-fix-regression-with-image-sensor-trackpads.patch new file mode 100644 index 00000000000..17d7804743d --- /dev/null +++ b/queue-3.3/input-synaptics-fix-regression-with-image-sensor-trackpads.patch @@ -0,0 +1,37 @@ +From 899c612d74d4a242158a4db20367388d6299c028 Mon Sep 17 00:00:00 2001 +From: Benjamin Herrenschmidt +Date: Fri, 20 Apr 2012 22:34:49 -0700 +Subject: Input: synaptics - fix regression with "image sensor" trackpads + +From: Benjamin Herrenschmidt + +commit 899c612d74d4a242158a4db20367388d6299c028 upstream. + +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 +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/mouse/synaptics.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -274,7 +274,8 @@ static int synaptics_set_advanced_gestur + 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)) diff --git a/queue-3.3/series b/queue-3.3/series index 0e44297c4e5..fe9f270505a 100644 --- a/queue-3.3/series +++ b/queue-3.3/series @@ -34,3 +34,4 @@ usb-gadget-uvc-uvc_request_data-length-field-must-be-signed.patch pipes-add-a-packetized-pipe-mode-for-writing.patch autofs-make-the-autofsv5-packet-file-descriptor-use-a-packetized-pipe.patch crypto-talitos-properly-lock-access-to-global-talitos-registers.patch +input-synaptics-fix-regression-with-image-sensor-trackpads.patch