From patchwork Sat Apr 24 20:41:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Ragwitz X-Patchwork-Id: 94864 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3OLO7Lp018554 for ; Sat, 24 Apr 2010 21:26:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752429Ab0DXV0n (ORCPT ); Sat, 24 Apr 2010 17:26:43 -0400 Received: from weedy.perldition.org ([85.10.210.75]:54457 "EHLO weedy.perldition.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752338Ab0DXV0n (ORCPT ); Sat, 24 Apr 2010 17:26:43 -0400 Received: from p4fd764a8.dip.t-dialin.net ([79.215.100.168]:33232 helo=tardis.perldition.org) by weedy.perldition.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.60) (envelope-from ) id 1O5mAl-0008V7-Qy; Sat, 24 Apr 2010 22:41:56 +0200 Received: from rafl by tardis.perldition.org with local (Exim 4.71) (envelope-from ) id 1O5mA6-00069d-JZ; Sat, 24 Apr 2010 22:41:14 +0200 From: Florian Ragwitz To: linux-input@vger.kernel.org Cc: Florian Ragwitz Subject: [PATCH 4/4] Input: elantech - Whitelist new models with firmware version 4.1 Date: Sat, 24 Apr 2010 22:41:02 +0200 Message-Id: <1272141662-23431-5-git-send-email-rafl@debian.org> X-Mailer: git-send-email 1.7.0.5 In-Reply-To: <1272141662-23431-1-git-send-email-rafl@debian.org> References: <1272141662-23431-1-git-send-email-rafl@debian.org> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 24 Apr 2010 21:26:44 +0000 (UTC) diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 254a967..70321b7 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -599,7 +599,8 @@ int elantech_detect(struct psmouse *psmouse, bool set_properties) pr_debug("elantech.c: Elantech version query result 0x%02x, 0x%02x, 0x%02x.\n", param[0], param[1], param[2]); - if (param[0] == 0 || param[1] != 0) { + if ((param[0] == 0 || param[1] != 0) && + (param[0] != 4 && param[1] != 1 && param[2] != 1)) { if (!force_elantech) { pr_debug("elantech.c: Probably not a real Elantech touchpad. Aborting.\n"); return -1;