iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'clk-fixes' into clk-next

Browse Source 
* clk-fixes:
  clk: ti: omap3+: dpll: use non-locking version of clk_get_rate
This commit is contained in:
Stephen Boyd 2016-02-22 14:16:24 -08:00
commit 1e59403990
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/clk/ti/dpll3xxx.c
View File

@ -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 {