As the synaptics device may not respond to the first command in psmouse_probe
when a machine is booting up, the patch gives a second probe if the first
one fails.
Signed-off-by: Chung-yih Wang <cyw...@chromium.org>
---
drivers/input/mouse/psmouse-base.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/input/mouse/psmouse-base.c
b/drivers/input/mouse/psmouse-base.c
index 22fe254..c4fc5ad 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -1053,8 +1053,17 @@ static int psmouse_probe(struct psmouse *psmouse)
*/
param[0] = 0xa5;
- if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETID))
- return -1;
+ if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETID)) {
+ /*
+ * Reprobe the device if it did not respond to the GETID
+ * command. Before retry, additional dummy command is sent
+ * to clear the 'RESEND' response if exists.
+ */
+ psmouse_warn(psmouse, "GETID probe failed, retrying...\n");
+ ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11);
+ if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETID))
+ return -1;
+ }
if (param[0] != 0x00 && param[0] != 0x03 &&
param[0] != 0x04 && param[0] != 0xff)
--
1.7.7.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
