input

Pull input fix from Dmitry Torokhov:
 "A simple fix for a recent regression in Synaptics driver"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics - fix regression with "image sensor" trackpads

parents 69964ea4 899c612d

drivers/input/mouse/synaptics.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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))