diff options
author | Alon Ziv <alonz@nolaviz.org> | 2007-08-30 00:22:48 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-08-30 00:22:48 -0400 |
commit | 554fc1935365ddba0936dfb6dc4088ba4ef23a4f (patch) | |
tree | fb65818a45ce5867e7c9ddeb7918d2ee4b22e695 /drivers/input | |
parent | b9d2d110b10f7b4788d0fdd328cf57e34b767817 (diff) |
Input: psmouse - reset harder during probe
Some rodents appear to be extra-finicky, and require both PSMOUSE_RESET_DIS
and PSMOUSE_RESET_BAT before they are unconfused enough to be probed.
Signed-off-by: Alon Ziv <lkml@nolaviz.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/mouse/psmouse-base.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index b9f0fb2530e2..073525756532 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
@@ -648,9 +648,10 @@ static int psmouse_extensions(struct psmouse *psmouse, | |||
648 | 648 | ||
649 | /* | 649 | /* |
650 | * Reset to defaults in case the device got confused by extended | 650 | * Reset to defaults in case the device got confused by extended |
651 | * protocol probes. Note that we do full reset becuase some mice | 651 | * protocol probes. Note that we follow up with full reset because |
652 | * put themselves to sleep when see PSMOUSE_RESET_DIS. | 652 | * some mice put themselves to sleep when they see PSMOUSE_RESET_DIS. |
653 | */ | 653 | */ |
654 | ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS); | ||
654 | psmouse_reset(psmouse); | 655 | psmouse_reset(psmouse); |
655 | 656 | ||
656 | if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse, set_properties) == 0) | 657 | if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse, set_properties) == 0) |