Commit 1e594039 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-fixes' into clk-next 

* clk-fixes:
  clk: ti: omap3+: dpll: use non-locking version of clk_get_rate
parents 732d6913 a0d54c38

drivers/clk/ti/dpll3xxx.c

+2 −1
Original line number Diff line number Diff line
@@ -460,7 +460,8 @@ int omap3_noncore_dpll_enable(struct clk_hw *hw) 


	parent = clk_hw_get_parent(hw);



	if (clk_hw_get_rate(hw) == clk_get_rate(dd->clk_bypass)) {

	if (clk_hw_get_rate(hw) ==

	    clk_hw_get_rate(__clk_get_hw(dd->clk_bypass))) {

		WARN_ON(parent != __clk_get_hw(dd->clk_bypass));

		r = _omap3_noncore_dpll_bypass(clk);

	} else {