Revert "CHROMIUM: Input: synaptics - skip trackpoint reconnect"

This reverts commit 6e600b92ec9ff57a6e4935ae31f3b6425c4c3344.

Due to the new trackpoint driver optimization, we no longer need this
workaround. The long trackpoint connect / reconnect sequence has been
mostly replaced by a power-on reset command which speeds things up
considerably.

TEST=Manual. Run powerd_suspend + wake, verify long trackpoint reconnect
delay no longer exists.
BUG=chrome-os-partner:18349

Change-Id: I52ff4515b5048ac836ac6c70cdb0140a89b9bb9b
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/46323
Reviewed-by: Chung-yih Wang <cywang@chromium.org>

diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index ba8c710..c4fc5ad 100644 (file)
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -1501,10 +1501,8 @@ static int psmouse_reconnect(struct serio *serio)
        psmouse_set_state(psmouse, PSMOUSE_INITIALIZING);
 
        if (psmouse->reconnect) {
-               /* Skip trackpoint reconnect to reduce the latency */
-               if (strcmp(serio->name, "Synaptics pass-through"))
-                       if (psmouse->reconnect(psmouse))
-                               goto out;
+               if (psmouse->reconnect(psmouse))
+                       goto out;
        } else {
                psmouse_reset(psmouse);