From patchwork Sat Apr 24 20:40:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Ragwitz X-Patchwork-Id: 94862 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 o3OLO7Ln018554 for ; Sat, 24 Apr 2010 21:26:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752248Ab0DXV0k (ORCPT ); Sat, 24 Apr 2010 17:26:40 -0400 Received: from weedy.perldition.org ([85.10.210.75]:54453 "EHLO weedy.perldition.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751048Ab0DXV0k (ORCPT ); Sat, 24 Apr 2010 17:26:40 -0400 Received: from p4fd764a8.dip.t-dialin.net ([79.215.100.168]:33229 helo=tardis.perldition.org) by weedy.perldition.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.60) (envelope-from ) id 1O5mAh-0008V4-TF; Sat, 24 Apr 2010 22:41:52 +0200 Received: from rafl by tardis.perldition.org with local (Exim 4.71) (envelope-from ) id 1O5mA3-00069U-M9; Sat, 24 Apr 2010 22:41:11 +0200 From: Florian Ragwitz To: linux-input@vger.kernel.org Cc: Florian Ragwitz Subject: [PATCH 1/4] Input: elantech - Assume all firmware versions >= 2.48 use 6 byte packets Date: Sat, 24 Apr 2010 22:40:59 +0200 Message-Id: <1272141662-23431-2-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:41 +0000 (UTC) diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index a138b5d..07f6b17 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -666,7 +666,8 @@ int elantech_init(struct psmouse *psmouse) * Assume every version greater than this is new EeePC style * hardware with 6 byte packets */ - if (etd->fw_version_maj >= 0x02 && etd->fw_version_min >= 0x30) { + if ((etd->fw_version_maj == 0x02 && etd->fw_version_min >= 0x30) || + etd->fw_version_maj > 0x02) { etd->hw_version = 2; /* For now show extra debug information */ etd->debug = 1;