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

Commit abf82e8f authored by Błażej Szczygieł's avatar Błażej Szczygieł Committed by Jiri Kosina
Browse files

HID: a4tech: fix horizontal scrolling 

Since recent high resolution scrolling changes the A4Tech driver must
check for the "REL_WHEEL_HI_RES" usage code.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=203369


Fixes: 2dc702c9 ("HID: input: use the Resolution Multiplier for high-resolution scrolling")
Signed-off-by: default avatarBłażej Szczygieł <spaz16@wp.pl>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 64caea53

drivers/hid/hid-a4tech.c

+8 −3
Original line number Diff line number Diff line
@@ -38,8 +38,10 @@ static int a4_input_mapped(struct hid_device *hdev, struct hid_input *hi, 
{

	struct a4tech_sc *a4 = hid_get_drvdata(hdev);



	if (usage->type == EV_REL && usage->code == REL_WHEEL)

	if (usage->type == EV_REL && usage->code == REL_WHEEL_HI_RES) {

		set_bit(REL_HWHEEL, *bit);

		set_bit(REL_HWHEEL_HI_RES, *bit);

	}



	if ((a4->quirks & A4_2WHEEL_MOUSE_HACK_7) && usage->hid == 0x00090007)

		return -1;
@@ -60,7 +62,7 @@ static int a4_event(struct hid_device *hdev, struct hid_field *field, 
	input = field->hidinput->input;



	if (a4->quirks & A4_2WHEEL_MOUSE_HACK_B8) {

		if (usage->type == EV_REL && usage->code == REL_WHEEL) {

		if (usage->type == EV_REL && usage->code == REL_WHEEL_HI_RES) {

			a4->delayed_value = value;

			return 1;

		}
@@ -68,6 +70,8 @@ static int a4_event(struct hid_device *hdev, struct hid_field *field, 
		if (usage->hid == 0x000100b8) {

			input_event(input, EV_REL, value ? REL_HWHEEL :

					REL_WHEEL, a4->delayed_value);

			input_event(input, EV_REL, value ? REL_HWHEEL_HI_RES :

					REL_WHEEL_HI_RES, a4->delayed_value * 120);

			return 1;

		}

	}
@@ -77,8 +81,9 @@ static int a4_event(struct hid_device *hdev, struct hid_field *field, 
		return 1;

	}



	if (usage->code == REL_WHEEL && a4->hw_wheel) {

	if (usage->code == REL_WHEEL_HI_RES && a4->hw_wheel) {

		input_event(input, usage->type, REL_HWHEEL, value);

		input_event(input, usage->type, REL_HWHEEL_HI_RES, value * 120);

		return 1;

	}