From patchwork Fri May 21 23:18:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [08/13] Revert "UBUNTU: SAUCE: input/mouse/alps: Do not call psmouse_reset() for alps" Date: Fri, 21 May 2010 13:18:11 -0000 From: Leann Ogasawara X-Patchwork-Id: 53223 Message-Id: <1274483891.19284.3333.camel@emiko> To: kernel-team >From 3528db6ba513aff221c7703df7fb428ec7dedb27 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara 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 --- drivers/input/mouse/alps.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) 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)