CHERRY-PICK: CHROMIUM: Input: synaptics - skip trackpoint reconnect

Since trackpoint properties are probed in the boot time, it should
be safe to skip the reconnect function as we don't need to
probe the properties again to reduce the latency of unresponsiveness.

BUG=chrome-os-partner:15015
TEST=on device; use powerd_suspend and then hit a key to wake it up
   see if the trackpoint/trackpoint could be active in 3~4 seconds
   after resume instead of 7 seconds long

Signed-off-by: Chung-yih Wang <cywang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/43510
Tested-by: Agnes Cheng <agnescheng@google.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
Reviewed-by: Gediminas Ramanauskas <gedis@chromium.org>
(cherry picked from commit 6e600b92ec9ff57a6e4935ae31f3b6425c4c3344)

Change-Id: Ibb4f979d0aacad9f66ef4bd1047e97f6343446ab
Signed-off-by: Chung-yih Wang <cywang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/43766
Reviewed-by: Gediminas Ramanauskas <gedis@chromium.org>
Reviewed-by: Benson Leung <bleung@chromium.org>

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