diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-08-25 13:07:10 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-08-26 09:24:45 +0200 |
| commit | 79346d620e9de87912de73337f6df8b7f9a46888 (patch) | |
| tree | 36d2e3bb4e9f70485a778b3234e324d08ad13bab /drivers/hid | |
| parent | cee5aa1f81b1e88d8de05df226bfd207041954c2 (diff) | |
| download | linux-79346d620e9de87912de73337f6df8b7f9a46888.tar.gz linux-79346d620e9de87912de73337f6df8b7f9a46888.tar.bz2 linux-79346d620e9de87912de73337f6df8b7f9a46888.zip | |
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>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-input.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 2619f7f4517a..2df7fddbd119 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -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); |