Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 003bc1de authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Felipe Balbi
Browse files

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



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: 279d4bc6 ("usb: gadget: udc: renesas_usb3: add support for generic phy")
Cc: <stable@vger.kernel.org> # v4.15+
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent d9988440

drivers/usb/gadget/udc/renesas_usb3.c

+8 −8
Original line number Diff line number Diff line
@@ -2634,6 +2634,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)
@@ -2643,14 +2651,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);