Revert "BACKPORT: HID: multitouch: Fix fields from pen report ID being interpreted for multitouch"
Seems to be implicated in regression where Dell P2314T & Smart board 8055i stop working.
BUG=chromium:539335
This reverts commit c0e1f38f27d1f3e39aff4ceac066c320ba893857.
Change-Id: I2f781f966dc01d44d2291262cf61836549679402
Reviewed-on: https://chromium-review.googlesource.com/304336
Reviewed-by: Michael Spang <spang@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Tested-by: Michael Spang <spang@chromium.org>
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 1e1e26f..522654b 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -803,8 +803,6 @@
struct hid_field *field, struct hid_usage *usage,
unsigned long **bit, int *max)
{
- struct mt_device *td = hid_get_drvdata(hdev);
-
/* Only map fields from TouchScreen or TouchPad collections.
* We need to ignore fields that belong to other collections
* such as Mouse that might have the same GenericDesktop usages. */
@@ -813,12 +811,7 @@
field->application != HID_DG_TOUCHPAD)
return -1;
- /* The check for pen_report_id ensures we don't process
- * HID_DG_CONTACTCOUNT from the pen report as it is outside the physical
- * collection, but within the report ID. */
- if ((field->physical == HID_DG_STYLUS) ||
- ((field->physical == 0)
- && (field->report->id == td->pen_report_id)))
+ if (field->physical == HID_DG_STYLUS)
return mt_pen_input_mapping(hdev, hi, field, usage, bit, max);
return mt_touch_input_mapping(hdev, hi, field, usage, bit, max);
