1 files changed, 21 insertions, 8 deletions

diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index ae095f009b4f..185663e0b5f4 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -121,8 +121,10 @@ static int dwc2_driver_remove(struct platform_device *dev)
 {
         struct dwc2_hsotg *hsotg = platform_get_drvdata(dev);
 
-        dwc2_hcd_remove(hsotg);
-        s3c_hsotg_remove(hsotg);
+        if (hsotg->hcd_enabled)
+                dwc2_hcd_remove(hsotg);
+        if (hsotg->gadget_enabled)
+                s3c_hsotg_remove(hsotg);
 
         return 0;
 }
@@ -234,12 +236,23 @@ static int dwc2_driver_probe(struct platform_device *dev)
 
         spin_lock_init(&hsotg->lock);
         mutex_init(&hsotg->init_mutex);
-        retval = dwc2_gadget_init(hsotg, irq);
-        if (retval)
-                return retval;
-        retval = dwc2_hcd_init(hsotg, irq, params);
-        if (retval)
-                return retval;
+
+        if (hsotg->dr_mode != USB_DR_MODE_HOST) {
+                retval = dwc2_gadget_init(hsotg, irq);
+                if (retval)
+                        return retval;
+                hsotg->gadget_enabled = 1;
+        }
+
+        if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL) {
+                retval = dwc2_hcd_init(hsotg, irq, params);
+                if (retval) {
+                        if (hsotg->gadget_enabled)
+                                s3c_hsotg_remove(hsotg);
+                        return retval;
+                }
+                hsotg->hcd_enabled = 1;
+        }
 
         platform_set_drvdata(dev, hsotg);