|
@@ -414,22 +414,27 @@ static int tpkbd_probe(struct hid_device *hdev,
|
|
|
ret = hid_parse(hdev);
|
|
|
if (ret) {
|
|
|
hid_err(hdev, "hid_parse failed\n");
|
|
|
- goto err_free;
|
|
|
+ goto err;
|
|
|
}
|
|
|
|
|
|
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
|
|
|
if (ret) {
|
|
|
hid_err(hdev, "hid_hw_start failed\n");
|
|
|
- goto err_free;
|
|
|
+ goto err;
|
|
|
}
|
|
|
|
|
|
uhdev = (struct usbhid_device *) hdev->driver_data;
|
|
|
|
|
|
- if (uhdev->ifnum == 1)
|
|
|
- return tpkbd_probe_tp(hdev);
|
|
|
+ if (uhdev->ifnum == 1) {
|
|
|
+ ret = tpkbd_probe_tp(hdev);
|
|
|
+ if (ret)
|
|
|
+ goto err_hid;
|
|
|
+ }
|
|
|
|
|
|
return 0;
|
|
|
-err_free:
|
|
|
+err_hid:
|
|
|
+ hid_hw_stop(hdev);
|
|
|
+err:
|
|
|
return ret;
|
|
|
}
|
|
|
|