Commit 62d78461 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Revert "Input: synaptics - fix handling of disabling gesture mode"

This reverts commit e51e3849: we
actually do want the device to work in extended W mode, as this is the
mode that allows us receiving multiple contact information.

Cc: stable@vger.kernel.org
parent 218c1f76
...@@ -519,18 +519,14 @@ static int synaptics_set_mode(struct psmouse *psmouse) ...@@ -519,18 +519,14 @@ static int synaptics_set_mode(struct psmouse *psmouse)
struct synaptics_data *priv = psmouse->private; struct synaptics_data *priv = psmouse->private;
priv->mode = 0; priv->mode = 0;
if (priv->absolute_mode)
if (priv->absolute_mode) {
priv->mode |= SYN_BIT_ABSOLUTE_MODE; priv->mode |= SYN_BIT_ABSOLUTE_MODE;
if (SYN_CAP_EXTENDED(priv->capabilities)) if (priv->disable_gesture)
priv->mode |= SYN_BIT_W_MODE;
}
if (!SYN_MODE_WMODE(priv->mode) && priv->disable_gesture)
priv->mode |= SYN_BIT_DISABLE_GESTURE; priv->mode |= SYN_BIT_DISABLE_GESTURE;
if (psmouse->rate >= 80) if (psmouse->rate >= 80)
priv->mode |= SYN_BIT_HIGH_RATE; priv->mode |= SYN_BIT_HIGH_RATE;
if (SYN_CAP_EXTENDED(priv->capabilities))
priv->mode |= SYN_BIT_W_MODE;
if (synaptics_mode_cmd(psmouse, priv->mode)) if (synaptics_mode_cmd(psmouse, priv->mode))
return -1; return -1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment