Commit 6b08e36b authored by Axel Lin's avatar Axel Lin Committed by Kishon Vijay Abraham I

phy: rockchip-usb: Fixup rockchip_usb_phy_power_on failure path

If rockchip_usb_phy_power() fails, we need to call clk_disable_unprepare()
before return. This is to ensure we have balanced clk_enable/disable calls.
Also remove unneeded ret checking in rockchip_usb_phy_power_off.
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent a5e5d3c0
...@@ -61,8 +61,6 @@ static int rockchip_usb_phy_power_off(struct phy *_phy) ...@@ -61,8 +61,6 @@ static int rockchip_usb_phy_power_off(struct phy *_phy)
return ret; return ret;
clk_disable_unprepare(phy->clk); clk_disable_unprepare(phy->clk);
if (ret)
return ret;
return 0; return 0;
} }
...@@ -78,8 +76,10 @@ static int rockchip_usb_phy_power_on(struct phy *_phy) ...@@ -78,8 +76,10 @@ static int rockchip_usb_phy_power_on(struct phy *_phy)
/* Power up usb phy analog blocks by set siddq 0 */ /* Power up usb phy analog blocks by set siddq 0 */
ret = rockchip_usb_phy_power(phy, 0); ret = rockchip_usb_phy_power(phy, 0);
if (ret) if (ret) {
clk_disable_unprepare(phy->clk);
return ret; return ret;
}
return 0; return 0;
} }
......
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