From 4b7cc1f9468e9c75d071351def702a38f788ca18 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Thu, 24 May 2012 01:13:01 -0700 Subject: [PATCH] --- yaml --- r: 306628 b: refs/heads/master c: e644dae645e167d154c0526358940986682a72b0 h: refs/heads/master 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 6600658bfe55..00ebbf2bbf19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86809173ce32ef03bd4d0389dfc72df0c805e9c4 +refs/heads/master: e644dae645e167d154c0526358940986682a72b0 diff --git a/trunk/drivers/input/mouse/synaptics.c b/trunk/drivers/input/mouse/synaptics.c index c778f27a59f0..c703d53be3a0 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))