From f3170c1a9042d6233975fab83f6c6e03338417bf Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Wed, 14 Nov 2012 16:59:17 +0100 Subject: [PATCH] --- yaml --- r: 343078 b: refs/heads/master c: 54f4c0c3e9d9ad50bf58a4f7c2bbdfb3fa4ab3a7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-multitouch.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e68267bed6a1..702f9f62c1bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f262d1fa2c651a5e2f92b6aee8779597631cd5d4 +refs/heads/master: 54f4c0c3e9d9ad50bf58a4f7c2bbdfb3fa4ab3a7 diff --git a/trunk/drivers/hid/hid-multitouch.c b/trunk/drivers/hid/hid-multitouch.c index 3687f797b731..3d2e6bbb0046 100644 --- a/trunk/drivers/hid/hid-multitouch.c +++ b/trunk/drivers/hid/hid-multitouch.c @@ -576,12 +576,15 @@ static int mt_event(struct hid_device *hid, struct hid_field *field, return 0; } - if (usage->hid == td->last_slot_field) - mt_complete_slot(td, field->hidinput->input); - - if (field->index == td->last_field_index - && td->num_received >= td->num_expected) - mt_sync_frame(td, field->hidinput->input); + if (usage->usage_index + 1 == field->report_count) { + /* we only take into account the last report. */ + if (usage->hid == td->last_slot_field) + mt_complete_slot(td, field->hidinput->input); + + if (field->index == td->last_field_index + && td->num_received >= td->num_expected) + mt_sync_frame(td, field->hidinput->input); + } }