Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 080de5ba authored Mar 17, 2015 by Axel Lin Committed by Kishon Vijay Abraham I Mar 26, 2015

phy: stih41x-usb: Fixup stih41x_usb_phy_power_on failure path



If stih41x_usb_phy_power_on() fails, we need to call clk_disable_unprepare()
before return error. This is to ensure we have balanced clk_enable/disable
calls.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

parent 739ae345

drivers/phy/phy-stih41x-usb.c

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -87,8 +87,12 @@ static int stih41x_usb_phy_power_on(struct phy *phy)
	return ret;		return ret;
	}		}

	return regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,		ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
	phy_dev->cfg->oscok, phy_dev->cfg->oscok);		phy_dev->cfg->oscok, phy_dev->cfg->oscok);
			if (ret)
			clk_disable_unprepare(phy_dev->clk);

			return ret;
	}		}

	static int stih41x_usb_phy_power_off(struct phy *phy)		static int stih41x_usb_phy_power_off(struct phy *phy)