|
@@ -257,14 +257,14 @@ static int whc_probe(struct umc_dev *umc)
|
|
|
|
|
|
ret = whc_init(whc);
|
|
ret = whc_init(whc);
|
|
if (ret)
|
|
if (ret)
|
|
- goto error;
|
|
|
|
|
|
+ goto error_whc_init;
|
|
|
|
|
|
wusbhc->dev = dev;
|
|
wusbhc->dev = dev;
|
|
wusbhc->uwb_rc = uwb_rc_get_by_grandpa(umc->dev.parent);
|
|
wusbhc->uwb_rc = uwb_rc_get_by_grandpa(umc->dev.parent);
|
|
if (!wusbhc->uwb_rc) {
|
|
if (!wusbhc->uwb_rc) {
|
|
ret = -ENODEV;
|
|
ret = -ENODEV;
|
|
dev_err(dev, "cannot get radio controller\n");
|
|
dev_err(dev, "cannot get radio controller\n");
|
|
- goto error;
|
|
|
|
|
|
+ goto error_uwb_rc;
|
|
}
|
|
}
|
|
|
|
|
|
if (whc->n_devices > USB_MAXCHILDREN) {
|
|
if (whc->n_devices > USB_MAXCHILDREN) {
|
|
@@ -311,8 +311,9 @@ error_usb_add_hcd:
|
|
wusbhc_destroy(wusbhc);
|
|
wusbhc_destroy(wusbhc);
|
|
error_wusbhc_create:
|
|
error_wusbhc_create:
|
|
uwb_rc_put(wusbhc->uwb_rc);
|
|
uwb_rc_put(wusbhc->uwb_rc);
|
|
-error:
|
|
|
|
|
|
+error_uwb_rc:
|
|
whc_clean_up(whc);
|
|
whc_clean_up(whc);
|
|
|
|
+error_whc_init:
|
|
usb_put_hcd(usb_hcd);
|
|
usb_put_hcd(usb_hcd);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|