| From 517fefb3d46c65786b3a48052ab0ec7c0f84b47d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 5 Jun 2021 15:17:43 +0200 |
| Subject: phy: ti: dm816x: Fix the error handling path in |
| 'dm816x_usb_phy_probe() |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit f7eedcb8539ddcbb6fe7791f1b4ccf43f905c72f ] |
| |
| Add an error handling path in the probe to release some resources, as |
| already done in the remove function. |
| |
| Fixes: 609adde838f4 ("phy: Add a driver for dm816x USB PHY") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Link: https://lore.kernel.org/r/ac5136881f6bdec50be19b3bf73b3bc1b15ef1f1.1622898974.git.christophe.jaillet@wanadoo.fr |
| Signed-off-by: Vinod Koul <vkoul@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/phy/ti/phy-dm816x-usb.c | 17 +++++++++++++---- |
| 1 file changed, 13 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/phy/ti/phy-dm816x-usb.c b/drivers/phy/ti/phy-dm816x-usb.c |
| index 57adc08a89b2..9fe6ea6fdae5 100644 |
| --- a/drivers/phy/ti/phy-dm816x-usb.c |
| +++ b/drivers/phy/ti/phy-dm816x-usb.c |
| @@ -242,19 +242,28 @@ static int dm816x_usb_phy_probe(struct platform_device *pdev) |
| |
| pm_runtime_enable(phy->dev); |
| generic_phy = devm_phy_create(phy->dev, NULL, &ops); |
| - if (IS_ERR(generic_phy)) |
| - return PTR_ERR(generic_phy); |
| + if (IS_ERR(generic_phy)) { |
| + error = PTR_ERR(generic_phy); |
| + goto clk_unprepare; |
| + } |
| |
| phy_set_drvdata(generic_phy, phy); |
| |
| phy_provider = devm_of_phy_provider_register(phy->dev, |
| of_phy_simple_xlate); |
| - if (IS_ERR(phy_provider)) |
| - return PTR_ERR(phy_provider); |
| + if (IS_ERR(phy_provider)) { |
| + error = PTR_ERR(phy_provider); |
| + goto clk_unprepare; |
| + } |
| |
| usb_add_phy_dev(&phy->phy); |
| |
| return 0; |
| + |
| +clk_unprepare: |
| + pm_runtime_disable(phy->dev); |
| + clk_unprepare(phy->refclk); |
| + return error; |
| } |
| |
| static int dm816x_usb_phy_remove(struct platform_device *pdev) |
| -- |
| 2.30.2 |
| |