diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-05-10 02:32:01 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-05-10 02:32:01 +0200 |
| commit | 3aa450c063e29b4f4b622480e1779e5e256d8f8f (patch) | |
| tree | d18942ff8bf862f2973f4e7adbf99c4f3e22a563 /drivers/input/mouse/synaptics.c | |
| parent | spi/devicetree: Move devicetree support code into spi directory (diff) | |
| parent | Linux 3.4-rc6 (diff) | |
| download | linux-3aa450c063e29b4f4b622480e1779e5e256d8f8f.tar.xz linux-3aa450c063e29b4f4b622480e1779e5e256d8f8f.zip | |
Merge tag 'v3.4-rc6' into spi/next
Linux 3.4-rc6
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 3 |
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)) |