aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-05-17 00:53:06 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 10:59:09 -0400
commitf3a5c73d5ecb40909db662c4d2ace497b25c5940 (patch)
tree5bfe12968e0cfb13fef2c752712cbf2c5d15bdb9 /drivers/input
parent64b14d375263019753dd1405e4edd91a1715301d (diff)
[PATCH] ALPS resume fix
ALPS needs to be reset for detection to work reliably when reconnecting. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Cc: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/alps.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 52c6fd2e70cc..42a9f7f6f8cb 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -341,6 +341,8 @@ static int alps_reconnect(struct psmouse *psmouse)
341 unsigned char param[4]; 341 unsigned char param[4];
342 int version; 342 int version;
343 343
344 psmouse_reset(psmouse);
345
344 if (!(priv->i = alps_get_model(psmouse, &version))) 346 if (!(priv->i = alps_get_model(psmouse, &version)))
345 return -1; 347 return -1;
346 348