diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 11:54:00 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 11:54:00 +0100 |
| commit | 7063e6c717f6108c4b3fc3135a516c86ef944870 (patch) | |
| tree | ec6eec10b4dc93474100e6e366df028bd3314fda /drivers/input/mouse/alps.c | |
| parent | 7ca0026495dbb644b4e32ede76be44072cb2bc7a (diff) | |
| parent | 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 1f85a9718c8..42a9f7f6f8c 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -341,6 +341,8 @@ static int alps_reconnect(struct psmouse *psmouse) unsigned char param[4]; int version; + psmouse_reset(psmouse); + if (!(priv->i = alps_get_model(psmouse, &version))) return -1; @@ -395,7 +397,7 @@ int alps_init(struct psmouse *psmouse) } if (param[0] & 0x04) { - printk(KERN_INFO " Enabling hardware tapping\n"); + printk(KERN_INFO "alps.c: Enabling hardware tapping\n"); if (alps_tap_mode(psmouse, 1)) printk(KERN_WARNING "alps.c: Failed to enable hardware tapping\n"); } |