On Tue, 2010-05-11 at 01:22 -0700, Dmitry Torokhov wrote:
> On Sat, May 08, 2010 at 06:22:09PM +0200, Christoph Fritz wrote:
> > On Wed, 2010-04-28 at 00:26 -0700, Dmitry Torokhov wrote:
> >
> > > What about simply resetting the mouse before actually trying to
> > > reconnect?
> >
> > Isn't psmouse_reconnect() the first in psmouse-base.c that gets
> called
> > after waking up from hibernation/suspend?
> > And should all ps2 devices get a reset or only the one which needs
> it
> > (synaptic touchpads not handled by synaptics driver)?
> >
>
> I think we should reset all devcices that do not provide reconnect
> method (this includes Synaptics hardware in bare PS/2 mode). Something
> like below.
>
> --
> Dmitry
>
> Input: psmouse - reset all types of mice before reconnecting
>
> From: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
>
> Synaptics hardware requires resetting device after suspend to ram
> in order for the device to be operational. The reset lives in
> synaptics-specific reconnect handler, but it is not being invoked
> if synaptics support is disabled and the device is handled as a
> standard PS/2 device (bare or IntelliMouse protocol).
>
> Let's add reset into generic reconnect handler as well.
>
> Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
> ---
>
> drivers/input/mouse/psmouse-base.c | 14 ++++++++++----
> 1 files changed, 10 insertions(+), 4 deletions(-)
>
>
> diff --git a/drivers/input/mouse/psmouse-base.c
> b/drivers/input/mouse/psmouse-base.c
> index cbc8072..a3c9731 100644
> --- a/drivers/input/mouse/psmouse-base.c
> +++ b/drivers/input/mouse/psmouse-base.c
> @@ -1394,6 +1394,7 @@ static int psmouse_reconnect(struct serio
> *serio)
> struct psmouse *psmouse = serio_get_drvdata(serio);
> struct psmouse *parent = NULL;
> struct serio_driver *drv = serio->drv;
> + unsigned char type;
> int rc = -1;
>
> if (!drv || !psmouse) {
> @@ -1413,10 +1414,15 @@ static int psmouse_reconnect(struct serio
> *serio)
> if (psmouse->reconnect) {
> if (psmouse->reconnect(psmouse))
> goto out;
> - } else if (psmouse_probe(psmouse) < 0 ||
> - psmouse->type != psmouse_extensions(psmouse,
> - psmouse_max_proto,
> false)) {
> - goto out;
> + } else {
> + psmouse_reset(psmouse);
> +
> + if (psmouse_probe(psmouse) < 0)
> + goto out;
> +
> + type = psmouse_extensions(psmouse, psmouse_max_proto,
> false);
> + if (psmouse->type != type)
> + goto out;
> }
>
> /* ok, the device type (and capabilities) match the old one,
>
>
This looks good and I can understand making this generic because it
doesn't hurt.
Thanks,
Christoph
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
