diff options
| author | Stefan Assmann <sassmann@kpanic.de> | 2015-08-26 13:11:49 -0700 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-12-02 23:25:32 -0500 |
| commit | da498f694c231f6560dc84fd5b8cb5169b7607aa (patch) | |
| tree | 002c85eabd0e2886b3440f229746c006fd6064a1 /drivers | |
| parent | 67d9383a959c8979daec4f8d782550f4c9baac14 (diff) | |
Input: psmouse - add small delay for IBM trackpoint pass-through mode
[ Upstream commit 66bc2f51ef7deabc8b8f3baa98ae64b65e5e973a ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/mouse/psmouse-base.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 95a3a6e2faf6..51a61e28b89e 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -1473,6 +1473,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; |