summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Youn <johnyoun@synopsys.com>2016-09-08 02:39:37 (GMT)
committerFelipe Balbi <felipe.balbi@linux.intel.com>2016-09-08 11:02:50 (GMT)
commitd0f0ac56b34b28e80223d7086b4decdf027c27ed (patch)
treeb7a473dd88722a65bcf5b44fb08177c370ea5497
parent3262ad824307c275922161e82c2db1458822f28c (diff)
downloadlinux-d0f0ac56b34b28e80223d7086b4decdf027c27ed.tar.xz
usb: dwc2: gadget: Only initialize device if in device mode
In dwc2_hsotg_udc_start(), don't initialize the controller for device mode unless we are actually in device mode. Tested-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Stefan Wahren <stefan.wahren@i2se.com> Signed-off-by: John Youn <johnyoun@synopsys.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
-rw-r--r--drivers/usb/dwc2/gadget.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 94bd19a..4cd6403 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -3466,8 +3466,11 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget,
otg_set_peripheral(hsotg->uphy->otg, &hsotg->gadget);
spin_lock_irqsave(&hsotg->lock, flags);
- dwc2_hsotg_init(hsotg);
- dwc2_hsotg_core_init_disconnected(hsotg, false);
+ if (dwc2_hw_is_device(hsotg)) {
+ dwc2_hsotg_init(hsotg);
+ dwc2_hsotg_core_init_disconnected(hsotg, false);
+ }
+
hsotg->enabled = 0;
spin_unlock_irqrestore(&hsotg->lock, flags);