Commit 6b08e36b authored Mar 04, 2015 by Axel Lin Committed by Kishon Vijay Abraham I Mar 12, 2015

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: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

parent a5e5d3c0

drivers/phy/phy-rockchip-usb.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -61,8 +61,6 @@ static int rockchip_usb_phy_power_off(struct phy *_phy)
		return ret;

		clk_disable_unprepare(phy->clk);
		if (ret)
		return ret;

		return 0;
		}
		@@ -78,8 +76,10 @@ static int rockchip_usb_phy_power_on(struct phy *_phy)

		/* Power up usb phy analog blocks by set siddq 0 */
		ret = rockchip_usb_phy_power(phy, 0);
		if (ret)
		if (ret) {
		clk_disable_unprepare(phy->clk);
		return ret;
		}

		return 0;
		}