Merge branch 'clk-fixes' into clk-next

* clk-fixes: clk: ti: omap3+: dpll: use non-locking version of clk_get_rate
zubinmehta · Feb 22, 2016 · 1e59403 · 1e59403
2 parents 732d691 + a0d54c3
commit 1e59403
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/clk/ti/dpll3xxx.c b/drivers/clk/ti/dpll3xxx.c
@@ -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 {