summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2014-09-23 12:08:07 -0400
committerJiri Kosina <jkosina@suse.cz>2014-10-01 09:11:22 +0200
commit494078b0bb578c4cf1e00275dd3224d793013488 (patch)
treeec7648e0f25ffeba1fe4631bdf4748f8406030c3 /drivers/hid
parent2546dacd3e0e48c40bbb99caf01455f1ade9bb24 (diff)
downloadlinux-494078b0bb578c4cf1e00275dd3224d793013488.tar.bz2
HID: wacom: move allocation of inputs earlier
This allows to have the input devices ready in while parsing the reports descriptor. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Acked-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/wacom_sys.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 62f3c899ab98..21ac2baa21be 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -1357,6 +1357,12 @@ static int wacom_probe(struct hid_device *hdev,
mutex_init(&wacom->lock);
INIT_WORK(&wacom->work, wacom_wireless_work);
+ if (!(features->quirks & WACOM_QUIRK_NO_INPUT)) {
+ error = wacom_allocate_inputs(wacom);
+ if (error)
+ goto fail_allocate_inputs;
+ }
+
/* set the default size in case we do not get them from hid */
wacom_set_default_phy(features);
@@ -1429,8 +1435,7 @@ static int wacom_probe(struct hid_device *hdev,
}
if (!(features->quirks & WACOM_QUIRK_NO_INPUT)) {
- error = wacom_allocate_inputs(wacom) ||
- wacom_register_inputs(wacom);
+ error = wacom_register_inputs(wacom);
if (error)
goto fail_register_inputs;
}
@@ -1464,7 +1469,6 @@ static int wacom_probe(struct hid_device *hdev,
return 0;
fail_hw_start:
- wacom_clean_inputs(wacom);
if (hdev->bus == BUS_BLUETOOTH)
device_remove_file(&hdev->dev, &dev_attr_speed);
fail_register_inputs:
@@ -1473,6 +1477,8 @@ fail_register_inputs:
fail_battery:
wacom_remove_shared_data(wacom_wac);
fail_shared_data:
+ wacom_clean_inputs(wacom);
+fail_allocate_inputs:
fail_type:
fail_pktlen:
fail_parse: