[PATCH -next] phy: phy-mtk-tphy: fix missing clk_disable_unprepare() on error in mtk_phy_init()
Wei Yongjun
weiyongjun1 at huawei.com
Tue Mar 20 06:19:59 PDT 2018
Fix the missing clk_disable_unprepare() before return
from mtk_phy_init() in the error handling case.
Signed-off-by: Wei Yongjun <weiyongjun1 at huawei.com>
---
drivers/phy/mediatek/phy-mtk-tphy.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c
index 38c281b..3ff9020 100644
--- a/drivers/phy/mediatek/phy-mtk-tphy.c
+++ b/drivers/phy/mediatek/phy-mtk-tphy.c
@@ -841,7 +841,7 @@ static int mtk_phy_init(struct phy *phy)
ret = clk_prepare_enable(instance->ref_clk);
if (ret) {
dev_err(tphy->dev, "failed to enable ref_clk\n");
- return ret;
+ goto disable_u3phya_ref;
}
switch (instance->type) {
@@ -859,10 +859,17 @@ static int mtk_phy_init(struct phy *phy)
break;
default:
dev_err(tphy->dev, "incompatible PHY type\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto disable_ref_clk;
}
return 0;
+
+disable_ref_clk:
+ clk_disable_unprepare(instance->ref_clk);
+disable_u3phya_ref:
+ clk_disable_unprepare(tphy->u3phya_ref);
+ return ret;
}
static int mtk_phy_power_on(struct phy *phy)
More information about the linux-arm-kernel
mailing list