aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/alps.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-06-01 03:39:51 -0400
committerDmitry Torokhov <dtor_core@ameritech.net>2005-06-01 03:39:51 -0400
commitc611763d048990de5cdf848d97af6392f8fa7430 (patch)
tree751da02aaf502efd102ba66bd11054a45f18a03f /drivers/input/mouse/alps.c
parent04df1925fcda9a35c716423ad2b73abd70eb0913 (diff)
Input: add ps2_drain() to libps2 to allow reading and discarding
given number of bytes from device. Change ps2_command to allow using 0 as command ID and actually pass it to the device instead of working as a drain. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mouse/alps.c')
-rw-r--r--drivers/input/mouse/alps.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 2679a165d39..ffdc8231319 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -270,7 +270,6 @@ static struct alps_model_info *alps_get_model(struct psmouse *psmouse, int *vers
270static int alps_passthrough_mode(struct psmouse *psmouse, int enable) 270static int alps_passthrough_mode(struct psmouse *psmouse, int enable)
271{ 271{
272 struct ps2dev *ps2dev = &psmouse->ps2dev; 272 struct ps2dev *ps2dev = &psmouse->ps2dev;
273 unsigned char param[3];
274 int cmd = enable ? PSMOUSE_CMD_SETSCALE21 : PSMOUSE_CMD_SETSCALE11; 273 int cmd = enable ? PSMOUSE_CMD_SETSCALE21 : PSMOUSE_CMD_SETSCALE11;
275 274
276 if (ps2_command(ps2dev, NULL, cmd) || 275 if (ps2_command(ps2dev, NULL, cmd) ||
@@ -280,7 +279,7 @@ static int alps_passthrough_mode(struct psmouse *psmouse, int enable)
280 return -1; 279 return -1;
281 280
282 /* we may get 3 more bytes, just ignore them */ 281 /* we may get 3 more bytes, just ignore them */
283 ps2_command(ps2dev, param, 0x0300); 282 ps2_drain(ps2dev, 3, 100);
284 283
285 return 0; 284 return 0;
286} 285}