Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drivers/input/mouse/synaptics.c

+4 −8
Original line number Diff line number Diff line
@@ -519,18 +519,14 @@ static int synaptics_set_mode(struct psmouse *psmouse) 
	struct synaptics_data *priv = psmouse->private;



	priv->mode = 0;



	if (priv->absolute_mode) {

	if (priv->absolute_mode)

		priv->mode |= SYN_BIT_ABSOLUTE_MODE;

		if (SYN_CAP_EXTENDED(priv->capabilities))

			priv->mode |= SYN_BIT_W_MODE;

	}



	if (!SYN_MODE_WMODE(priv->mode) && priv->disable_gesture)

	if (priv->disable_gesture)

		priv->mode |= SYN_BIT_DISABLE_GESTURE;



	if (psmouse->rate >= 80)

		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))

		return -1;