Merge commit 'v2.6.29-rc7' into core/locking

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 865fc69e9bc3..f3e4f7b0240d 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -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;