hid-multitouch.c.patch

68d67
< 	int last_mt_collection;	/* last known mt-related collection */
211a211,217
> static void set_last_slot_field(struct hid_usage *usage, struct mt_device *td,
> 		struct hid_input *hi)
> {
> 	if (!test_bit(usage->hid, hi->input->absbit))
> 		td->last_slot_field = usage->hid;
> }
>
243,246c249,250
< 			if (td->last_mt_collection == usage->collection_index) {
< 				td->last_slot_field = usage->hid;
< 				td->last_field_index = field->index;
< 			}
---
> 			set_last_slot_field(usage, td, hi);
> 			td->last_field_index = field->index;
257,260c261,262
< 			if (td->last_mt_collection == usage->collection_index) {
< 				td->last_slot_field = usage->hid;
< 				td->last_field_index = field->index;
< 			}
---
> 			set_last_slot_field(usage, td, hi);
> 			td->last_field_index = field->index;
268,271c270,271
< 			if (td->last_mt_collection == usage->collection_index) {
< 				td->last_slot_field = usage->hid;
< 				td->last_field_index = field->index;
< 			}
---
> 			set_last_slot_field(usage, td, hi);
> 			td->last_field_index = field->index;
274,277c274,275
< 			if (td->last_mt_collection == usage->collection_index) {
< 				td->last_slot_field = usage->hid;
< 				td->last_field_index = field->index;
< 			}
---
> 			set_last_slot_field(usage, td, hi);
> 			td->last_field_index = field->index;
282,285c280,281
< 			if (td->last_mt_collection == usage->collection_index) {
< 				td->last_slot_field = usage->hid;
< 				td->last_field_index = field->index;
< 			}
---
> 			set_last_slot_field(usage, td, hi);
> 			td->last_field_index = field->index;
293d288
< 			td->last_mt_collection = usage->collection_index;
300,303c295,296
< 			if (td->last_mt_collection == usage->collection_index) {
< 				td->last_slot_field = usage->hid;
< 				td->last_field_index = field->index;
< 			}
---
> 			set_last_slot_field(usage, td, hi);
> 			td->last_field_index = field->index;
312,315c305,306
< 			if (td->last_mt_collection == usage->collection_index) {
< 				td->last_slot_field = usage->hid;
< 				td->last_field_index = field->index;
< 			}
---
> 			set_last_slot_field(usage, td, hi);
> 			td->last_field_index = field->index;
327,330c318,319
< 			if (td->last_mt_collection == usage->collection_index) {
< 				td->last_slot_field = usage->hid;
< 				td->last_field_index = field->index;
< 			}
---
> 			set_last_slot_field(usage, td, hi);
> 			td->last_field_index = field->index;
333,334c322
< 			if (td->last_mt_collection == usage->collection_index)
< 				td->last_field_index = field->index;
---
> 			td->last_field_index = field->index;
339,340c327
< 			if (td->last_mt_collection == usage->collection_index)
< 				td->last_field_index = field->index;
---
> 			td->last_field_index = field->index;
557d543
< 	td->last_mt_collection = -1;