diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2015-06-20 19:18:03 (GMT) |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2015-06-20 20:26:40 (GMT) |
| commit | 85e88fab134d8896cf4d8be0aac10cc54018ee63 (patch) | |
| tree | cc0a6dab17bfc06837c8f6f1e1763f9490dec60e /drivers/clk/clk.c | |
| parent | ddfb157444e3cdb6da18ea759730b4b4af65d3d9 (diff) | |
| parent | 8eb92ab68f961bb9045d8d7882cceb2d6be0659d (diff) | |
| download | linux-85e88fab134d8896cf4d8be0aac10cc54018ee63.tar.xz | |
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 1cf479b..059e5d2 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. |