aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-multitouch.c
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2012-09-05 10:58:12 -0400
committerHenrik Rydberg <rydberg@euromail.se>2012-09-19 13:50:21 -0400
commitc5d40be5f5255c156a5ad851f395fb21bc44f379 (patch)
treef53e3b73222b23dadf6d94d4b9d041eb96b252d5 /drivers/hid/hid-multitouch.c
parent3e1b5015d94ec0bdfa5bd8c80a19bcba82bc505c (diff)
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>
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
-rw-r--r--drivers/hid/hid-multitouch.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index eee19c9f7b36..63f120b7877a 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -171,7 +171,9 @@ static struct mt_class mt_classes[] = {
171 MT_QUIRK_SLOT_IS_CONTACTID, 171 MT_QUIRK_SLOT_IS_CONTACTID,
172 .sn_move = 2048, 172 .sn_move = 2048,
173 .sn_width = 128, 173 .sn_width = 128,
174 .sn_height = 128 }, 174 .sn_height = 128,
175 .maxcontacts = 60,
176 },
175 { .name = MT_CLS_CYPRESS, 177 { .name = MT_CLS_CYPRESS,
176 .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP | 178 .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |
177 MT_QUIRK_CYPRESS, 179 MT_QUIRK_CYPRESS,