From: Henrik Rydberg <rydberg@euromail.se>
Date: Wed, 5 Sep 2012 14:58:12 +0000 (+0200)
Subject: HID: hid-multitouch: Fix contact count on 3M panels
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c5d40be5f5255c156a5ad851f395fb21bc44f379;p=~shefty%2Frdma-dev.git

HID: hid-multitouch: Fix contact count on 3M panels

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 <benjamin.tissoires@enac.fr>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
---

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index eee19c9f7b3..63f120b7877 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,