diff options
| author | Michael Turquette | 2015-06-20 21:18:03 +0200 |
|---|---|---|
| committer | Michael Turquette | 2015-06-20 22:26:40 +0200 |
| commit | 85e88fab134d8896cf4d8be0aac10cc54018ee63 (patch) | |
| tree | cc0a6dab17bfc06837c8f6f1e1763f9490dec60e /drivers/clk/clk.c | |
| parent | doc: dt: add documentation for lpc1850-ccu clk driver (diff) | |
| parent | cpufreq: exynos: remove Exynos4210 specific cpufreq driver support (diff) | |
| download | kernel-qcow2-linux-85e88fab134d8896cf4d8be0aac10cc54018ee63.tar.gz kernel-qcow2-linux-85e88fab134d8896cf4d8be0aac10cc54018ee63.tar.xz kernel-qcow2-linux-85e88fab134d8896cf4d8be0aac10cc54018ee63.zip | |
Merge branch 'clk-exynos-cpu-clk' into clk-next
Folded into this merge commit is a build error fix: s/clk/core in
clk_change_rate due to the new struct clk_core
Diffstat (limited to 'drivers/clk/clk.c')
| -rw-r--r-- | drivers/clk/clk.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 1cf479b9f3b4..059e5d25c9ba 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1417,6 +1417,9 @@ static void clk_change_rate(struct clk_core *core) if (core->notifier_count && old_rate != core->rate) __clk_notify(core, POST_RATE_CHANGE, old_rate, core->rate); + if (core->flags & CLK_RECALC_NEW_RATES) + (void)clk_calc_new_rates(core, core->new_rate); + /* * Use safe iteration, as change_rate can actually swap parents * for certain clock types. |