From: Dmitry Torokhov <dtor@insightbb.com>
Date: Thu, 3 May 2007 04:56:18 +0000 (-0400)
Subject: Input: synaptics - don't complain about failed resets
X-Git-Tag: Ubuntu-5.0.0-8.9~42805^2~9
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4bdd488f4bf7dc91b371fe160a4718b0a91bb2a4;p=mirror_ubuntu-disco-kernel.git

Input: synaptics - don't complain about failed resets

On many laptops (Compaq, HP) the touchpad is so slow responding
to reset that keyboard controller times out. The device is reset
nonetheless and works fine. Kill the "synaptics reset failed"
error; if device is not working then other parts of
synaptics_query_hardware() will fail anyway.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index c77788bf932d..666ad3a53fdb 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -185,7 +185,7 @@ static int synaptics_query_hardware(struct psmouse *psmouse)
 	int retries = 0;
 
 	while ((retries++ < 3) && psmouse_reset(psmouse))
-		printk(KERN_ERR "synaptics reset failed\n");
+		/* empty */;
 
 	if (synaptics_identify(psmouse))
 		return -1;