Commit 79346d62 authored Aug 25, 2014 by Benjamin Tissoires Committed by Jiri Kosina Aug 26, 2014

HID: input: force generic axis to be mapped to their user space axis



Atmel 840B digitizer presents a stylus interface which reports twice
the X coordinate and then twice the Y coordinate. In its current
implementation, hid-input assign the first X to X, then the second to Y,
then the first Y to Z, then the second one to RX.

This is wrong, and X should always be mapped to X, no matter what.
A solution consists in forcing X, Y, Z, RX, RY, RZ to be mapped to their
correct user space counter part.

Reported-by: Éric Brunet <Eric.Brunet@lps.ens.fr>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent cee5aa1f

drivers/hid/hid-input.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -599,6 +599,12 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
		/* These usage IDs map directly to the usage codes. */
		case HID_GD_X: case HID_GD_Y: case HID_GD_Z:
		case HID_GD_RX: case HID_GD_RY: case HID_GD_RZ:
		if (field->flags & HID_MAIN_ITEM_RELATIVE)
		map_rel(usage->hid & 0xf);
		else
		map_abs_clear(usage->hid & 0xf);
		break;

		case HID_GD_SLIDER: case HID_GD_DIAL: case HID_GD_WHEEL:
		if (field->flags & HID_MAIN_ITEM_RELATIVE)
		map_rel(usage->hid & 0xf);

Admin message