[PATCH 2/5] HID: hid-multitouch: get maxcontacts also from logical_max value
flat view
STALE5257d
From: benjamin.tissoires <hidden>
Date: 2012-05-04 12:54:09
Also in:
lkml
Subsystem:
hid core layer, the rest · Maintainers:
Jiri Kosina, Benjamin Tissoires, Linus Torvalds
From: Benjamin Tissoires <redacted> Win8 devices are required to present the feature "Maximum Contact Number". If the current value is 0, then, the driver can get the actual supported contact count by seeing the logical_max. Signed-off-by: Benjamin Tissoires <redacted> --- drivers/hid/hid-multitouch.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index c6ffb05..e205d1e 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c@@ -265,6 +265,8 @@ static void mt_feature_mapping(struct hid_device *hdev, case HID_DG_CONTACTMAX: td->maxcontact_report_id = field->report->id; td->maxcontacts = field->value[0]; + if (!td->maxcontacts) + td->maxcontacts = field->logical_maximum; if (td->mtclass.maxcontacts) /* check if the maxcontacts is given by the class */ td->maxcontacts = td->mtclass.maxcontacts;
--
1.7.7.6