diff options
| author |   Jason Gerecke <killertofu@gmail.com> | 2014-12-05 13:37:32 -0800 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2014-12-10 10:50:48 +0100 |
| commit | b58ba1ba1af9cfbad6f3af4c4fc3575d9aeae542 (patch) | |
| tree | e81f891a3b28e7dfb29675c58bf2e0de844137b2 /drivers/hid/wacom_wac.c | |
| parent | HID: wacom: Update maximum X/Y accounding to outbound offset (diff) | |
| download | linux-dev-b58ba1ba1af9cfbad6f3af4c4fc3575d9aeae542.tar.xz linux-dev-b58ba1ba1af9cfbad6f3af4c4fc3575d9aeae542.zip | |
HID: wacom: Initialize MT slots for generic devices at post_parse_hid
If a HID descriptor places HID_DG_CONTACTID before HID_DG_X and HID_DG_Y then
the ABS_X and ABS_Y will not be automatically initialized by the call to
input_mt_init_slots. To ensure that this is not a problem, we relocate that
call to occur after HID parsing has been completed and we've initalized all the
multitouch axes.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_wac.c')
| -rw-r--r-- | drivers/hid/wacom_wac.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 7b7a61a9194d..064fd6cf36c6 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1381,7 +1381,6 @@ static void wacom_wac_finger_usage_mapping(struct hid_device *hdev, { struct wacom *wacom = hid_get_drvdata(hdev); struct wacom_wac *wacom_wac = &wacom->wacom_wac; - struct input_dev *input = wacom_wac->input; unsigned touch_max = wacom_wac->features.touch_max; switch (usage->hid) { @@ -1400,8 +1399,6 @@ static void wacom_wac_finger_usage_mapping(struct hid_device *hdev, ABS_MT_POSITION_Y, 4); break; case HID_DG_CONTACTID: - input_mt_init_slots(input, wacom_wac->features.touch_max, - INPUT_MT_DIRECT); break; case HID_DG_INRANGE: break; |