summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2012-09-05 16:58:12 +0200
committerHenrik Rydberg <rydberg@euromail.se>2012-09-19 19:50:21 +0200
commitc5d40be5f5255c156a5ad851f395fb21bc44f379 (patch)
treef53e3b73222b23dadf6d94d4b9d041eb96b252d5 /drivers
parent3e1b5015d94ec0bdfa5bd8c80a19bcba82bc505c (diff)
downloadop-kernel-dev-c5d40be5f5255c156a5ad851f395fb21bc44f379.zip
op-kernel-dev-c5d40be5f5255c156a5ad851f395fb21bc44f379.tar.gz
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')
-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 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,
OpenPOWER on IntegriCloud