diff options
author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:07:02 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:07:02 -0400 |
commit | 1f15d694522af9cd7492695f11dd2dc77b6cf098 (patch) | |
tree | 7f67a4c38456ec73359d576a5c602d18c3c3ef72 /drivers/input/mouse/alps.c | |
parent | fff9cfd99c0f88645c3f50d7476d6c8cef99f140 (diff) | |
parent | 254feb882a7c6e4e51416dff6a97d847fbbba551 (diff) |
Automatic merge of /spare/repo/netdev-2.6 branch master
Diffstat (limited to 'drivers/input/mouse/alps.c')
-rw-r--r-- | drivers/input/mouse/alps.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 1f85a9718c89..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 | ||
@@ -395,7 +397,7 @@ int alps_init(struct psmouse *psmouse) | |||
395 | } | 397 | } |
396 | 398 | ||
397 | if (param[0] & 0x04) { | 399 | if (param[0] & 0x04) { |
398 | printk(KERN_INFO " Enabling hardware tapping\n"); | 400 | printk(KERN_INFO "alps.c: Enabling hardware tapping\n"); |
399 | if (alps_tap_mode(psmouse, 1)) | 401 | if (alps_tap_mode(psmouse, 1)) |
400 | printk(KERN_WARNING "alps.c: Failed to enable hardware tapping\n"); | 402 | printk(KERN_WARNING "alps.c: Failed to enable hardware tapping\n"); |
401 | } | 403 | } |