Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758701AbZATJVH (ORCPT ); Tue, 20 Jan 2009 04:21:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754802AbZATJUr (ORCPT ); Tue, 20 Jan 2009 04:20:47 -0500 Received: from mail-qy0-f11.google.com ([209.85.221.11]:59585 "EHLO mail-qy0-f11.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754756AbZATJUo (ORCPT ); Tue, 20 Jan 2009 04:20:44 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding :content-disposition:message-id; b=oK1K7md80L4Wo6Y1sqw5ltF+zkDP3s2dcq29TM/NFvPzpq8yJ540fa3kpuBFOelOYq 9HO0k9/rZuy+NdLDL/TVNViFIB3oTdAviBJkmYusJM0vKizoIrClb6z34pIhQfiSFGk7 7YJTmPSxXBdIDz8q5ivBvy5/53yZ/8QVIH2Ts= From: Dmitry Torokhov To: Arjan Opmeer Subject: Re: [Bug #12406] 2.6.28 thinks that my PS/2 mouse is a touchpad Date: Tue, 20 Jan 2009 01:19:54 -0800 User-Agent: KMail/1.10.3 (Linux/2.6.27.9-159.fc10.x86_64; KDE/4.1.3; x86_64; ; ) Cc: "Rafael J. Wysocki" , Linux Kernel Mailing List , Kernel Testers List , "Alexander E. Patrakov" , Denys Vlasenko References: <20090120014507.GA1557@adopmeer.homeip.net> In-Reply-To: <20090120014507.GA1557@adopmeer.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline Message-Id: <200901200119.59851.dmitry.torokhov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha id n0K9LBwM028804 Content-Length: 2504 Lines: 9 > On Mon, Jan 19, 2009 at 10:45:42PM +0100, Rafael J. Wysocki wrote:> > The following bug entry is on the current list of known regressions> > introduced between 2.6.27 and 2.6.28. Please verify if it still should> > be listed and let me know (either way).>> Well. Dmitry hasn't replied yet to my suggestion how to fix this as> presented in the Patch entry. Without help from him as the Linux input> subsystem maintainer there is not a lot I can do.>> This means the regression is still present in the current 2.6.29 git tree. Sorry, must have missed that. I think it's gonna be a bit chatty ifuser happens to have Logitech++ device attached, however I think ifwe complement it with the patch below I think it should work OK. -- Dmitry Input: psmouse - move Elantech detection towards end of the list Elantech'd detection routine misfires on Logitech's devices so let'smove it down to prevent false positives. Signed-off-by: Dmitry Torokhov --- drivers/input/mouse/psmouse-base.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.cindex f8f86de..e4106ba 100644--- a/drivers/input/mouse/psmouse-base.c+++ b/drivers/input/mouse/psmouse-base.c@@ -651,19 +651,6 @@ static int psmouse_extensions(struct psmouse *psmouse, max_proto = PSMOUSE_IMEX; } -/*- * Try Elantech touchpad.- */- if (max_proto > PSMOUSE_IMEX &&- elantech_detect(psmouse, set_properties) == 0) {- if (!set_properties || elantech_init(psmouse) == 0)- return PSMOUSE_ELANTECH;-/*- * Init failed, try basic relative protocols- */- max_proto = PSMOUSE_IMEX;- }- if (max_proto > PSMOUSE_IMEX) { if (genius_detect(psmouse, set_properties) == 0) return PSMOUSE_GENPS;@@ -679,6 +666,19 @@ static int psmouse_extensions(struct psmouse *psmouse, } /*+ * Try Elantech touchpad.+ */+ if (max_proto > PSMOUSE_IMEX &&+ elantech_detect(psmouse, set_properties) == 0) {+ if (!set_properties || elantech_init(psmouse) == 0)+ return PSMOUSE_ELANTECH;+/*+ * Init failed, try basic relative protocols+ */+ max_proto = PSMOUSE_IMEX;+ }++/* * Reset to defaults in case the device got confused by extended * protocol probes. Note that we follow up with full reset because * some mice put themselves to sleep when they see PSMOUSE_RESET_DIS.????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?