|
@@ -358,9 +358,14 @@ static void dwc2_gusbcfg_init(struct dwc2_hsotg *hsotg)
|
|
|
|
|
|
static int dwc2_vbus_supply_init(struct dwc2_hsotg *hsotg)
|
|
|
{
|
|
|
+ int ret;
|
|
|
+
|
|
|
hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
|
|
|
- if (IS_ERR(hsotg->vbus_supply))
|
|
|
- return 0;
|
|
|
+ if (IS_ERR(hsotg->vbus_supply)) {
|
|
|
+ ret = PTR_ERR(hsotg->vbus_supply);
|
|
|
+ hsotg->vbus_supply = NULL;
|
|
|
+ return ret == -ENODEV ? 0 : ret;
|
|
|
+ }
|
|
|
|
|
|
return regulator_enable(hsotg->vbus_supply);
|
|
|
}
|
|
@@ -4341,9 +4346,7 @@ static int _dwc2_hcd_start(struct usb_hcd *hcd)
|
|
|
|
|
|
spin_unlock_irqrestore(&hsotg->lock, flags);
|
|
|
|
|
|
- dwc2_vbus_supply_init(hsotg);
|
|
|
-
|
|
|
- return 0;
|
|
|
+ return dwc2_vbus_supply_init(hsotg);
|
|
|
}
|
|
|
|
|
|
/*
|