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

Commit 4d368456 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Dmitry Torokhov
Browse files

Input: synaptics - ensure we reset the device on resume



When resuming from suspend newer Synaptics touchpads do not recover
correctly.  Analysis of the resume sequence as applied in Linux was
compared to that of other operating systems.  This indicated that the
other OSs were resetting the mouse before attempting to detect it (for
all Synaptics touchpads, old and new).  Applying this same modification
fixes these newer Synaptics touchpads and brings the driver into line
with common OS reset behaviour.

Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 139ebe8d
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -182,11 +182,6 @@ static int synaptics_identify(struct psmouse *psmouse)

static int synaptics_query_hardware(struct psmouse *psmouse)
{
	int retries = 0;

	while ((retries++ < 3) && psmouse_reset(psmouse))
		/* empty */;

	if (synaptics_identify(psmouse))
		return -1;
	if (synaptics_model_id(psmouse))
@@ -582,6 +577,8 @@ static int synaptics_reconnect(struct psmouse *psmouse)
	struct synaptics_data *priv = psmouse->private;
	struct synaptics_data old_priv = *priv;

	psmouse_reset(psmouse);

	if (synaptics_detect(psmouse, 0))
		return -1;

@@ -640,6 +637,8 @@ int synaptics_init(struct psmouse *psmouse)
	if (!priv)
		return -1;

	psmouse_reset(psmouse);

	if (synaptics_query_hardware(psmouse)) {
		printk(KERN_ERR "Unable to query Synaptics hardware.\n");
		goto init_fail;