usb: gadget: udc: renesas_usb3: should call devm_phy_get() before add udc

BugLink: http://bugs.launchpad.net/bugs/1790188
commit 003bc1dee216b1fb8e02040a95672bea0f1fe797 upstream.

This patch fixes an issue that this driver cannot call phy_init()
if a gadget driver is alreadly loaded because usb_add_gadget_udc()
might call renesas_usb3_start() via .udc_start.
This patch also revises the typo (s/an optional/optional/).

Fixes: 279d4bc64060 ("usb: gadget: udc: renesas_usb3: add support for generic phy")
Cc: <stable@vger.kernel.org> # v4.15+
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
index 3cff51dc4c96bca227dca4fba9a4729275c4289c..1fc96d9bb5af0c9d33d75ec49f6eb80f054a690a 100644 (file)
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -2639,6 +2639,14 @@ static int renesas_usb3_probe(struct platform_device *pdev)
        if (ret < 0)
                goto err_alloc_prd;
 
+       /*
+        * This is optional. So, if this driver cannot get a phy,
+        * this driver will not handle a phy anymore.
+        */
+       usb3->phy = devm_phy_get(&pdev->dev, "usb");
+       if (IS_ERR(usb3->phy))
+               usb3->phy = NULL;
+
        pm_runtime_enable(&pdev->dev);
        ret = usb_add_gadget_udc(&pdev->dev, &usb3->gadget);
        if (ret < 0)
@@ -2648,14 +2656,6 @@ static int renesas_usb3_probe(struct platform_device *pdev)
        if (ret < 0)
                goto err_dev_create;
 
-       /*
-        * This is an optional. So, if this driver cannot get a phy,
-        * this driver will not handle a phy anymore.
-        */
-       usb3->phy = devm_phy_get(&pdev->dev, "usb");
-       if (IS_ERR(usb3->phy))
-               usb3->phy = NULL;
-
        usb3->workaround_for_vbus = priv->workaround_for_vbus;
 
        renesas_usb3_debugfs_init(usb3, &pdev->dev);