tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'clk-fixes' into clk-next

* clk-fixes:
clk: ti: omap3+: dpll: use non-locking version of clk_get_rate

Stephen Boyd 1e594039 732d6913

+2 -1
+2 -1
drivers/clk/ti/dpll3xxx.c
··· 460 460 461 461 parent = clk_hw_get_parent(hw); 462 462 463 - if (clk_hw_get_rate(hw) == clk_get_rate(dd->clk_bypass)) { 463 + if (clk_hw_get_rate(hw) == 464 + clk_hw_get_rate(__clk_get_hw(dd->clk_bypass))) { 464 465 WARN_ON(parent != __clk_get_hw(dd->clk_bypass)); 465 466 r = _omap3_noncore_dpll_bypass(clk); 466 467 } else {