From 21a1482dbf4afb9e66ef91d548e798837b2d1d6e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 30 Apr 2012 11:07:53 -0700 Subject: [PATCH] --- yaml --- r: 299853 b: refs/heads/master c: fbf717629ff03f110f177d244933276423f99a27 h: refs/heads/master i: 299851: 97fec64e91a2f600996e727f3b871f98ab5300eb v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/synaptics.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1a4475dd5276..f58f161eac04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 810b4de25e53459323ff48957b0162b48d6cbd57 +refs/heads/master: fbf717629ff03f110f177d244933276423f99a27 diff --git a/trunk/drivers/input/mouse/synaptics.c b/trunk/drivers/input/mouse/synaptics.c index 8081a0a5d602..a4b14a41cbf4 100644 --- a/trunk/drivers/input/mouse/synaptics.c +++ b/trunk/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))