From patchwork Wed Sep 5 15:09:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Rydberg X-Patchwork-Id: 1409731 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id E1B833FC71 for ; Wed, 5 Sep 2012 15:03:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751318Ab2IEPDO (ORCPT ); Wed, 5 Sep 2012 11:03:14 -0400 Received: from smtprelay-b21.telenor.se ([195.54.99.212]:36908 "EHLO smtprelay-b21.telenor.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751238Ab2IEPDN (ORCPT ); Wed, 5 Sep 2012 11:03:13 -0400 Received: from ipb2.telenor.se (ipb2.telenor.se [195.54.127.165]) by smtprelay-b21.telenor.se (Postfix) with ESMTP id 83E40EA566; Wed, 5 Sep 2012 17:03:12 +0200 (CEST) X-SENDER-IP: [85.230.170.20] X-LISTENER: [smtp.bredband.net] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ah9zANJoR1BV5qoUPGdsb2JhbABFij+vVwSBBxkBAQEBHhkNJ4IhAQU6HBMBDxAISRQlChoTiBG6cxSLBi6Fa2ADlViFb40RgVY X-IronPort-AV: E=Sophos;i="4.80,374,1344204000"; d="scan'208";a="403477044" Received: from c-14aae655.710-13-64736c12.cust.bredbandsbolaget.se (HELO polaris) ([85.230.170.20]) by ipb2.telenor.se with SMTP; 05 Sep 2012 17:03:11 +0200 Received: by polaris (sSMTP sendmail emulation); Wed, 05 Sep 2012 17:09:37 +0200 From: "Henrik Rydberg" Date: Wed, 5 Sep 2012 17:09:37 +0200 To: Benjamin Tissoires Cc: Dmitry Torokhov , Jiri Kosina , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 20/20] HID: hid-multitouch: Fix contact count on 3M panels Message-ID: <20120905150937.GA260@polaris.bitmath.org> References: <1346528835-363-1-git-send-email-rydberg@euromail.se> <1346528835-363-21-git-send-email-rydberg@euromail.se> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Some devices report the number of contacts via the unreliable CONTACTCOUNT usage, rather than using the CONTACTMAX feature. Without this patch, the 3M devices are constrained to the default maximum of ten fingers. Cc: Benjamin Tissoires Signed-off-by: Henrik Rydberg --- Benjamin, are you ok with 0x506 being treated this way as well? Thanks, Henrik drivers/hid/hid-multitouch.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index eee19c9..63f120b 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -171,7 +171,9 @@ static struct mt_class mt_classes[] = { MT_QUIRK_SLOT_IS_CONTACTID, .sn_move = 2048, .sn_width = 128, - .sn_height = 128 }, + .sn_height = 128, + .maxcontacts = 60, + }, { .name = MT_CLS_CYPRESS, .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP | MT_QUIRK_CYPRESS,