diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-27 13:30:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-27 13:30:14 -0500 |
| commit | b9ea44bf2c70b08b9ab3f3d71c2d16d6a134d35e (patch) | |
| tree | 2901d283a837411dd722d72491304814b9ff20d6 | |
| parent | 29a9faa641857425af76e44f2fab22db53032401 (diff) | |
| parent | a0d54c3899aaeb047969d9479263c6bcf385c331 (diff) | |
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
| -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) | |||
| 460 | 460 | ||
| 461 | parent = clk_hw_get_parent(hw); | 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 | WARN_ON(parent != __clk_get_hw(dd->clk_bypass)); | 465 | WARN_ON(parent != __clk_get_hw(dd->clk_bypass)); |
| 465 | r = _omap3_noncore_dpll_bypass(clk); | 466 | r = _omap3_noncore_dpll_bypass(clk); |
| 466 | } else { | 467 | } else { |