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

Commit 4cf56a89 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Jiri Kosina
Browse files

HID: multitouch: do not blindly set EV_KEY or EV_ABS bits 



Now that input core insists on having dev->absinfo when device claims to
generate EV_ABS in its dev->evbit, we should not be blindly setting that
bit.

The code in question might have been needed before input_set_abs_params()
started setting EV_ABS in device's evbit, but not anymore, and is now
breaking devices such as SMART SPNL-6075 Touchscreen.

Fixes: 6ecfe51b ("Input: refuse to register absolute devices ...")
Reported-by: default avatarMatthias Fend <Matthias.Fend@wolfvision.net>
Tested-by: default avatarMatthias Fend <Matthias.Fend@wolfvision.net>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a91ab911

drivers/hid/hid-multitouch.c

+4 −12
Original line number Diff line number Diff line
@@ -620,16 +620,6 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
	return 0;

}



static int mt_touch_input_mapped(struct hid_device *hdev, struct hid_input *hi,

		struct hid_field *field, struct hid_usage *usage,

		unsigned long **bit, int *max)

{

	if (usage->type == EV_KEY || usage->type == EV_ABS)

		set_bit(usage->type, hi->input->evbit);



	return -1;

}



static int mt_compute_slot(struct mt_device *td, struct input_dev *input)

{

	__s32 quirks = td->mtclass.quirks;
@@ -969,8 +959,10 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi, 
		return 0;



	if (field->application == HID_DG_TOUCHSCREEN ||

	    field->application == HID_DG_TOUCHPAD)

		return mt_touch_input_mapped(hdev, hi, field, usage, bit, max);

	    field->application == HID_DG_TOUCHPAD) {

		/* We own these mappings, tell hid-input to ignore them */

		return -1;

	}



	/* let hid-core decide for the others */

	return 0;