aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/hid-multitouch.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 38c4ca24343e..45968f7970f8 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -598,13 +598,16 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
598 hid_map_usage(hi, usage, bit, max, 598 hid_map_usage(hi, usage, bit, max,
599 EV_MSC, MSC_TIMESTAMP); 599 EV_MSC, MSC_TIMESTAMP);
600 input_set_capability(hi->input, EV_MSC, MSC_TIMESTAMP); 600 input_set_capability(hi->input, EV_MSC, MSC_TIMESTAMP);
601 mt_store_field(usage, td, hi);
602 /* Ignore if indexes are out of bounds. */ 601 /* Ignore if indexes are out of bounds. */
603 if (field->index >= field->report->maxfield || 602 if (field->index >= field->report->maxfield ||
604 usage->usage_index >= field->report_count) 603 usage->usage_index >= field->report_count)
605 return 1; 604 return 1;
606 td->scantime_index = field->index; 605 td->scantime_index = field->index;
607 td->scantime_val_index = usage->usage_index; 606 td->scantime_val_index = usage->usage_index;
607 /*
608 * We don't set td->last_slot_field as scan time is
609 * global to the report.
610 */
608 return 1; 611 return 1;
609 case HID_DG_CONTACTCOUNT: 612 case HID_DG_CONTACTCOUNT:
610 /* Ignore if indexes are out of bounds. */ 613 /* Ignore if indexes are out of bounds. */