Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fc7b46c authored by Amit Pundir's avatar Amit Pundir Committed by Dmitry Shmidt
Browse files

Revert "hid-multitouch: Filter collections by application usage." 



This reverts commit 0840b80c.

This patch is already upstreamed in v4.4, commit
658d4aed (HID: hid-multitouch: Filter collections by application usage.),
and further fixed/cleaned up afterwards in commits
c2ef8f21 (HID: multitouch: add support for trackpads),
76f5902a (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: default avatarAmit Pundir <amit.pundir@linaro.org>
parent 379cf6e8

drivers/hid/hid-multitouch.c

+0 −10
Original line number Diff line number Diff line
@@ -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];