From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753781Ab2IEPDP (ORCPT ); Wed, 5 Sep 2012 11:03:15 -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 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" 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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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, -- 1.7.12