From ef04fe1eed83a0bae8188fdee3f660ee61e04262 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Wed, 21 Dec 2005 00:51:31 -0500 Subject: [PATCH] --- yaml --- r: 16783 b: refs/heads/master c: ba44995a1e84b6cebf32e61d9492e8e133d192ce h: refs/heads/master i: 16781: b2e659f01c6aea883352baebea5474854f252ad8 16779: b5e1ceaf7315fabe3e0e669469491e7aba204ff4 16775: 9449ee8ae0645483f0983c48be5e8b079e55dee4 16767: cbc6674aadbd3e7458b5977b527d7a01bb8224a9 v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/psmouse-base.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 1a0bfb0ca28b..62ebd53133db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5e9c9ca54e31c0f629bae487eadaa5b8515b86d +refs/heads/master: ba44995a1e84b6cebf32e61d9492e8e133d192ce diff --git a/trunk/drivers/input/mouse/psmouse-base.c b/trunk/drivers/input/mouse/psmouse-base.c index 6ee9999a2eaa..4d5ecc04c5b6 100644 --- a/trunk/drivers/input/mouse/psmouse-base.c +++ b/trunk/drivers/input/mouse/psmouse-base.c @@ -527,11 +527,15 @@ static int psmouse_extensions(struct psmouse *psmouse, 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; @@ -539,12 +543,6 @@ static int psmouse_extensions(struct psmouse *psmouse, if (max_proto >= PSMOUSE_IMPS && intellimouse_detect(psmouse, set_properties) == 0) 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 psmouse *psmouse, * extensions. */ psmouse_reset(psmouse); - ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS); } return PSMOUSE_PS2;