Attachment 61327 Details for Bug 134690

[patch] Patch to fix the turning off of the mouse

mouse-reset.diff (text/plain), 1.62 KB, created by Vojtech Pavlik on 2005-12-18 09:40:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vojtech Pavlik

Created: 2005-12-18 09:40:59 UTC

Size: 1.62 KB

patch

obsolete

>Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
>---
>
> drivers/input/mouse/psmouse-base.c |   15 ++++++---------
> 1 files changed, 6 insertions(+), 9 deletions(-)
>
>Index: work/drivers/input/mouse/psmouse-base.c
>===================================================================
>--- work.orig/drivers/input/mouse/psmouse-base.c
>+++ work/drivers/input/mouse/psmouse-base.c
>@@ -527,11 +527,15 @@ static int psmouse_extensions(struct psm
> 	if (max_proto > PSMOUSE_IMEX && ps2pp_init(psmouse, set_properties) == 0)
> 		return PSMOUSE_PS2PP;
> 
>+	if (max_proto > PSMOUSE_IMEX && trackpoint_detect(psmouse, set_properties) == 0)
>+		return PSMOUSE_TRACKPOINT;
>+
> /*
>  * Reset to defaults in case the device got confused by extended
>- * protocol probes.
>+ * protocol probes. Note that we do full reset becuase some mice
>+ * put themselves to sleep when see PSMOUSE_RESET_DIS.
>  */
>-	ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
>+	psmouse_reset(psmouse);
> 
> 	if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse, set_properties) == 0)
> 		return PSMOUSE_IMEX;
>@@ -540,12 +544,6 @@ static int psmouse_extensions(struct psm
> 		return PSMOUSE_IMPS;
> 
> /*
>- * Try to initialize the IBM TrackPoint
>- */
>-	if (max_proto > PSMOUSE_IMEX && trackpoint_detect(psmouse, set_properties) == 0)
>-		return PSMOUSE_TRACKPOINT;
>-
>-/*
>  * Okay, all failed, we have a standard mouse here. The number of the buttons
>  * is still a question, though. We assume 3.
>  */
>@@ -559,7 +557,6 @@ static int psmouse_extensions(struct psm
>  * extensions.
>  */
> 		psmouse_reset(psmouse);
>-		ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
> 	}
> 
> 	return PSMOUSE_PS2;

Actions: View | Diff

Attachments on bug 134690: 61327