public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Stefan Assmann <sassmann@kpanic.de>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Input: psmouse - add small delay for IBM trackpoint pass-through mode
Date: Wed, 26 Aug 2015 13:13:20 -0700	[thread overview]
Message-ID: <20150826201320.GA7754@dtor-ws> (raw)
In-Reply-To: <1439649618-3366-1-git-send-email-sassmann@kpanic.de>

On Sat, Aug 15, 2015 at 04:40:18PM +0200, Stefan Assmann wrote:
> 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>

Applied, thank you.

> ---
>  drivers/input/mouse/psmouse-base.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
> index ec347703..ad18dab 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;
> -- 
> 2.4.3
> 

-- 
Dmitry

  reply	other threads:[~2015-08-26 20:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-15 14:40 [PATCH] Input: psmouse - add small delay for IBM trackpoint pass-through mode Stefan Assmann
2015-08-26 20:13 ` Dmitry Torokhov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-08-16 15:33 Andreas Mohr
2015-08-17  7:35 ` Stefan Assmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150826201320.GA7754@dtor-ws \
    --to=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sassmann@kpanic.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox