diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-27 19:30:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-27 19:30:14 +0100 |
| commit | b9ea44bf2c70b08b9ab3f3d71c2d16d6a134d35e (patch) | |
| tree | 2901d283a837411dd722d72491304814b9ff20d6 /drivers | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
| parent | clk: ti: omap3+: dpll: use non-locking version of clk_get_rate (diff) | |
| download | linux-b9ea44bf2c70b08b9ab3f3d71c2d16d6a134d35e.tar.xz linux-b9ea44bf2c70b08b9ab3f3d71c2d16d6a134d35e.zip | |
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fix from Stephen Boyd:
"One small fix to keep OMAP platforms working across a suspend/resume
cycle"
* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
clk: ti: omap3+: dpll: use non-locking version of clk_get_rate
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/ti/dpll3xxx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/ti/dpll3xxx.c b/drivers/clk/ti/dpll3xxx.c index 1c300388782b..cc739291a3ce 100644 --- 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 { |