Commit 3a254fea authored by Peter Chen's avatar Peter Chen Committed by Greg Kroah-Hartman

usb: chipidea: imx: Add usb_phy_shutdown at probe's error path

If not, the PHY will be active even the controller is not in use.
We find this issue due to the PHY's clock refcount is not correct
due to -EPROBE_DEFER return after phy's init.
Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 222bed9b
...@@ -131,7 +131,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) ...@@ -131,7 +131,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n", dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n",
ret); ret);
goto err_clk; goto err_phy;
} }
} }
...@@ -143,7 +143,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) ...@@ -143,7 +143,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Can't register ci_hdrc platform device, err=%d\n", "Can't register ci_hdrc platform device, err=%d\n",
ret); ret);
goto err_clk; goto err_phy;
} }
if (data->usbmisc_data) { if (data->usbmisc_data) {
...@@ -164,6 +164,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) ...@@ -164,6 +164,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
disable_device: disable_device:
ci_hdrc_remove_device(data->ci_pdev); ci_hdrc_remove_device(data->ci_pdev);
err_phy:
if (data->phy)
usb_phy_shutdown(data->phy);
err_clk: err_clk:
clk_disable_unprepare(data->clk); clk_disable_unprepare(data->clk);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment