The patch titled
ALPS: fix enabling hardware tapping
has been added to the -mm tree. Its filename is
alps-fix-enabling-hardware-tapping.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
alps-fix-enabling-hardware-tapping.patch
From: Peter Osterlund <[EMAIL PROTECTED]>
please send changlog
Signed-off-by: Peter Osterlund <[EMAIL PROTECTED]>
Cc: Vojtech Pavlik <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/input/mouse/alps.c | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff -puN drivers/input/mouse/alps.c~alps-fix-enabling-hardware-tapping
drivers/input/mouse/alps.c
--- devel/drivers/input/mouse/alps.c~alps-fix-enabling-hardware-tapping
2005-07-06 01:21:06.000000000 -0700
+++ devel-akpm/drivers/input/mouse/alps.c 2005-07-06 01:21:06.000000000
-0700
@@ -2,7 +2,7 @@
* ALPS touchpad PS/2 mouse driver
*
* Copyright (c) 2003 Neil Brown <[EMAIL PROTECTED]>
- * Copyright (c) 2003 Peter Osterlund <[EMAIL PROTECTED]>
+ * Copyright (c) 2003-2005 Peter Osterlund <[EMAIL PROTECTED]>
* Copyright (c) 2004 Dmitry Torokhov <[EMAIL PROTECTED]>
* Copyright (c) 2005 Vojtech Pavlik <[EMAIL PROTECTED]>
*
@@ -350,7 +350,6 @@ static int alps_tap_mode(struct psmouse
static int alps_reconnect(struct psmouse *psmouse)
{
struct alps_data *priv = psmouse->private;
- unsigned char param[4];
int version;
psmouse_reset(psmouse);
@@ -361,11 +360,7 @@ static int alps_reconnect(struct psmouse
if (priv->i->flags & ALPS_PASS && alps_passthrough_mode(psmouse, 1))
return -1;
- if (alps_get_status(psmouse, param))
- return -1;
-
- if (!(param[0] & 0x04))
- alps_tap_mode(psmouse, 1);
+ alps_tap_mode(psmouse, 1);
if (alps_absolute_mode(psmouse)) {
printk(KERN_ERR "alps.c: Failed to enable absolute mode\n");
@@ -389,7 +384,6 @@ static void alps_disconnect(struct psmou
int alps_init(struct psmouse *psmouse)
{
struct alps_data *priv;
- unsigned char param[4];
int version;
psmouse->private = priv = kmalloc(sizeof(struct alps_data), GFP_KERNEL);
@@ -403,16 +397,8 @@ int alps_init(struct psmouse *psmouse)
if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 1))
goto init_fail;
- if (alps_get_status(psmouse, param)) {
- printk(KERN_ERR "alps.c: touchpad status report request
failed\n");
- goto init_fail;
- }
-
- if (param[0] & 0x04) {
- 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");
- }
+ if (alps_tap_mode(psmouse, 1))
+ printk(KERN_WARNING "alps.c: Failed to enable hardware
tapping\n");
if (alps_absolute_mode(psmouse)) {
printk(KERN_ERR "alps.c: Failed to enable absolute mode\n");
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
