diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2016-04-26 14:47:53 +0530 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-04-27 10:16:58 -0700 |
| commit | 9fc7b46c3d3ffdd135c601e5c28a6bb316f3a011 (patch) | |
| tree | 0e24e8a91fb6b1179073c0d9469f517497acf0d9 | |
| parent | 379cf6e8ddb187ad202bf05d22251e280fee26d1 (diff) | |
Revert "hid-multitouch: Filter collections by application usage."
This reverts commit 0840b80cb9626906b57df54e7229db60f9aea4f2.
This patch is already upstreamed in v4.4, commit
658d4aed59b3 (HID: hid-multitouch: Filter collections by application usage.),
and further fixed/cleaned up afterwards in commits
c2ef8f21ea8f (HID: multitouch: add support for trackpads),
76f5902aebda (HID: hid-multitouch: Simplify setup and frame synchronization) et al.
By having this duplicate patch in AOSP we are doing redundant
checks for Touchscreen and Touchpad devices.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | drivers/hid/hid-multitouch.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 96759b270360..3d664d01305e 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -434,16 +434,6 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, if ((usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON) td->buttons_count++; - /* 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. */ - if (field->application == HID_DG_TOUCHSCREEN) - set_bit(INPUT_PROP_DIRECT, hi->input->propbit); - else if (field->application == HID_DG_TOUCHPAD) - set_bit(INPUT_PROP_POINTER, hi->input->propbit); - else - return 0; - if (usage->usage_index) prev_usage = &field->usage[usage->usage_index - 1]; |