summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorStefan Assmann <sassmann@kpanic.de>2015-08-26 23:11:49 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-08-26 23:14:25 +0300
commit66bc2f51ef7deabc8b8f3baa98ae64b65e5e973a (patch)
treec99fc9e53bd47406938ad31859a3578aa3e820e5 /drivers/input
parent534fcb3bdaab801636d2146079462f7fdf52be0a (diff)
downloadlinux-66bc2f51ef7deabc8b8f3baa98ae64b65e5e973a.tar.xz
Input: psmouse - add small delay for IBM trackpoint pass-through mode
There are trackpoint devices that fail to respond to the PS2 command PSMOUSE_CMD_GETID if immediately queried after the parent device is deactivated. Add a small delay for the hardware to get in a sane state before sending any PS2 commands. One example of such a system is: Lenovo ThinkPad X120e, model 30515QG synaptics: Touchpad model: 1, fw: 8.0, id: 0x1e2b1, caps: 0xd001a3/0x940300/0x121c00, board id: 1811, fw id: 797391 Signed-off-by: Stefan Assmann <sassmann@kpanic.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/psmouse-base.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index ec3477036150..ad18dab0ac47 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -1540,6 +1540,10 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
if (error)
goto err_clear_drvdata;
+ /* give PT device some time to settle down before probing */
+ if (serio->id.type == SERIO_PS_PSTHRU)
+ usleep_range(10000, 15000);
+
if (psmouse_probe(psmouse) < 0) {
error = -ENODEV;
goto err_close_serio;