From patchwork Fri May 21 23:18:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 53223 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 43BF2B7D2F for ; Sat, 22 May 2010 09:18:34 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbU6-00052Q-63; Sat, 22 May 2010 00:18:30 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbU4-000520-8B for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:18:28 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OFbU4-0000P5-5n for ; Sat, 22 May 2010 00:18:28 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OFbU3-0006hy-Or for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:18:28 +0100 Subject: [PATCH 08/13] Revert "UBUNTU: SAUCE: input/mouse/alps: Do not call psmouse_reset() for alps" From: Leann Ogasawara To: kernel-team In-Reply-To: <1274483333.19284.3264.camel@emiko> References: <1274483333.19284.3264.camel@emiko> Date: Fri, 21 May 2010 16:18:11 -0700 Message-ID: <1274483891.19284.3333.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >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)