From: Gregory Herrero <gregory.herrero@xxxxxxxxx>
Signed-off-by: Gregory Herrero <gregory.herrero@xxxxxxxxx>
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@xxxxxxxxx>
---
drivers/usb/dwc2/gadget.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 200168e..0b3c571 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -3411,7 +3411,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
struct device *dev = hsotg->dev;
struct s3c_hsotg_plat *plat = dev->platform_data;
struct phy *phy;
- struct usb_phy *uphy;
+ struct usb_phy *uphy = NULL;
struct s3c_hsotg_ep *eps;
int epnum;
int ret;
@@ -3555,12 +3555,20 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
if (ret)
goto err_ep_mem;
+ if (!IS_ERR_OR_NULL(uphy)) {
+ ret = otg_set_peripheral(uphy->otg, &hsotg->gadget);
+ if (ret && ret != -ENOTSUPP)
+ goto err_set_peripheral;
+ }
+
s3c_hsotg_create_debug(hsotg);
s3c_hsotg_dump(hsotg);
return 0;
+err_set_peripheral:
+ usb_del_gadget_udc(&hsotg->gadget);
err_ep_mem:
kfree(eps);
err_supplies:
--
1.9.1
----------------------------------------------------------------------
Intel Sweden AB
Registered Office: Knarrarnasgatan 15, 164 40 Kista, Stockholm, Sweden
Registration Number: 556189-6027
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
