aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-05-03 00:56:18 -0400
committerDmitry Torokhov <dtor@insightbb.com>2007-05-03 00:56:18 -0400
commit4bdd488f4bf7dc91b371fe160a4718b0a91bb2a4 (patch)
tree77b6a4117105fafbadca58a4296e122b8fb28362 /drivers/input
parenta830df367cc8cd802b45baed2449bea267727721 (diff)
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>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/synaptics.c2
1 files changed, 1 insertions, 1 deletions
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)
185 int retries = 0; 185 int retries = 0;
186 186
187 while ((retries++ < 3) && psmouse_reset(psmouse)) 187 while ((retries++ < 3) && psmouse_reset(psmouse))
188 printk(KERN_ERR "synaptics reset failed\n"); 188 /* empty */;
189 189
190 if (synaptics_identify(psmouse)) 190 if (synaptics_identify(psmouse))
191 return -1; 191 return -1;