diff options
| author |   Jaroslav Kysela <perex@perex.cz> | 2010-02-16 11:19:18 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-02-16 11:19:18 +0100 |
| commit | ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0 (patch) | |
| tree | d83637979db83bb9d5a23e190148b90b60c976d2 /drivers/input/mouse/psmouse-base.c | |
| parent | ALSA: USB MIDI support for Access Music VirusTI (diff) | |
| parent | ALSA: usb-audio: reduce MIDI packet size to work around broken firmware (diff) | |
| download | linux-dev-ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0.tar.xz linux-dev-ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0.zip | |
Merge branch 'fixes' into devel
Diffstat (limited to 'drivers/input/mouse/psmouse-base.c')
| -rw-r--r-- | drivers/input/mouse/psmouse-base.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index fd0bc094616a..401ac6b6edd4 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -1137,7 +1137,10 @@ static void psmouse_cleanup(struct serio *serio) if (psmouse->cleanup) psmouse->cleanup(psmouse); - psmouse_reset(psmouse); +/* + * Reset the mouse to defaults (bare PS/2 protocol). + */ + ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS); /* * Some boxes, such as HP nx7400, get terribly confused if mouse |