aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds2012-04-30 10:13:48 -0700
committerLinus Torvalds2012-04-30 10:13:48 -0700
commit84e92ef4f7addba97ff54810d1602b47d7c00ca4 (patch)
treebf24d50861b3f37992d0288b25aaf65b11f18b4c /drivers
parent69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff)
parent899c612d74d4a242158a4db20367388d6299c028 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fix from Dmitry Torokhov: "A simple fix for a recent regression in Synaptics driver" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: synaptics - fix regression with "image sensor" trackpads
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/mouse/synaptics.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 8081a0a5d602..a4b14a41cbf4 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))