1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
index 5a2d845fb1a6..10585da8e360 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -1799,6 +1799,9 @@ static int renesas_usb3_start(struct usb_gadget *gadget,
         /* hook up the driver */
         usb3->driver = driver;
 
+        pm_runtime_enable(usb3_to_dev(usb3));
+        pm_runtime_get_sync(usb3_to_dev(usb3));
+
         renesas_usb3_init_controller(usb3);
 
         return 0;
@@ -1816,6 +1819,9 @@ static int renesas_usb3_stop(struct usb_gadget *gadget)
         renesas_usb3_stop_controller(usb3);
         spin_unlock_irqrestore(&usb3->lock, flags);
 
+        pm_runtime_put(usb3_to_dev(usb3));
+        pm_runtime_disable(usb3_to_dev(usb3));
+
         return 0;
 }
 
@@ -1891,9 +1897,6 @@ static int renesas_usb3_remove(struct platform_device *pdev)
 
         device_remove_file(&pdev->dev, &dev_attr_role);
 
-        pm_runtime_put(&pdev->dev);
-        pm_runtime_disable(&pdev->dev);
-
         usb_del_gadget_udc(&usb3->gadget);
 
         __renesas_usb3_ep_free_request(usb3->ep0_req);
@@ -2099,9 +2102,6 @@ static int renesas_usb3_probe(struct platform_device *pdev)
 
         usb3->workaround_for_vbus = priv->workaround_for_vbus;
 
-        pm_runtime_enable(&pdev->dev);
-        pm_runtime_get_sync(&pdev->dev);
-
         dev_info(&pdev->dev, "probed\n");
 
         return 0;