Patchwork [08/13] Revert "UBUNTU: SAUCE: input/mouse/alps: Do not call psmouse_reset() for alps"

login
register
mail settings
Submitter Leann Ogasawara
Date May 21, 2010, 11:18 p.m.
Message ID <1274483891.19284.3333.camel@emiko>
Download mbox | patch
Permalink /patch/53223/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - May 21, 2010, 11:18 p.m.
>From 3528db6ba513aff221c7703df7fb428ec7dedb27 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri, 21 May 2010 15:05:03 -0700
Subject: [PATCH 08/13] Revert "UBUNTU: SAUCE: input/mouse/alps: Do not call psmouse_reset() for alps"

This reverts commit e7a2b3c4935eba04d7dcb743c2c80af3e6039046.

This is a pretty ancient patch we've been carrying from release to
release.  It was proposed that this should have been dropped in the
Lucid cycle.  Drop for Maverick and see who screams.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 drivers/input/mouse/alps.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index f7be1ec..99d5876 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -632,8 +632,7 @@  static int alps_reconnect(struct psmouse *psmouse)
 {
 	const struct alps_model_info *model;
 
-	/* UBUNTU: Causes lockups on resume */
-	/* psmouse_reset(psmouse); */
+	psmouse_reset(psmouse);
 
 	model = alps_get_model(psmouse, NULL);
 	if (!model)