git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
mouse
/
synaptics.c
diff --git
a/drivers/input/mouse/synaptics.c
b/drivers/input/mouse/synaptics.c
index c77788bf932dfc586506c6784a8643eb78ffc86c..666ad3a53fdbfe74b9d978cd5cbdd22763075c78 100644
(file)
--- 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;