From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Torokhov Subject: Re: [PATCH v2 7/7] Input: elantech - add v3 hardware support Date: Thu, 25 Aug 2011 00:06:42 -0700 Message-ID: <20110825070642.GB15655@core.coreip.homeip.net> References: <1314164686-866-1-git-send-email-jj_ding@emc.com.tw> <1314164686-866-8-git-send-email-jj_ding@emc.com.tw> <20110824143520.GB23868@thinkpad-t410> <87mxeynvpt.fsf@emc.com.tw> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-yx0-f174.google.com ([209.85.213.174]:60716 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753134Ab1HYHGt (ORCPT ); Thu, 25 Aug 2011 03:06:49 -0400 Content-Disposition: inline In-Reply-To: <87mxeynvpt.fsf@emc.com.tw> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: JJ Ding Cc: Seth Forshee , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Aaron Huang , Tom Lin , =?iso-8859-1?Q?=C9ric?= Piel , Daniel Kurtz , Chase Douglas , Henrik Rydberg , Alessandro Rubini On Thu, Aug 25, 2011 at 09:09:02AM +0800, JJ Ding wrote: > Hi Seth, > > Thank you. You are right. > I think I somehow tested the worng touchpad for this patch. > How about we change it thusly: Input: elamtech - fix V3 packet checking Signed-off-by: Dmitry Torokhov --- drivers/input/mouse/elantech.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 1e2b9da..d814bf74 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -508,24 +508,18 @@ static int elantech_packet_check_v2(struct psmouse *psmouse) */ static int elantech_packet_check_v3(struct psmouse *psmouse) { + const u8 debounce_packet[] = { 0xc4, 0xff, 0xff, 0x02, 0xff, 0xff }; unsigned char *packet = psmouse->packet; - if ((packet[0] & 0x0c) == 0x04 && - (packet[3] & 0xcf) == 0x02) + if (!memcmp(packet, debounce_packet, sizeof(debounce_packet))) + return PACKET_DEBOUNCE; + + if ((packet[0] & 0x0c) == 0x04 && (packet[3] & 0xcf) == 0x02) return PACKET_V3_HEAD; - if ((packet[0] & 0x0c) == 0x0c && - (packet[3] & 0xce) == 0x0c) + if ((packet[0] & 0x0c) == 0x0c && (packet[3] & 0xce) == 0x0c) return PACKET_V3_TAIL; - if (packet[0] == 0xc4 && - packet[1] == 0xff && - packet[2] == 0xff && - packet[3] == 0x02 && - packet[4] == 0xff && - packet[5] == 0xff) - return PACKET_DEBOUNCE; - return PACKET_UNKNOWN; } Thanks. -- Dmitry