diff options
| author | Viresh Kumar <viresh.kumar@st.com> | 2012-04-17 13:15:38 +0200 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2012-04-25 01:37:41 +0200 |
| commit | 1b2f99037a29d48d03ddd2fd0dc117888ec737f4 (patch) | |
| tree | e914fe01d0cda61112866d4db1e2e6b71d7db57d /drivers/clk | |
| parent | clk: clk-private: Add DEFINE_CLK macro (diff) | |
| download | linux-1b2f99037a29d48d03ddd2fd0dc117888ec737f4.tar.xz linux-1b2f99037a29d48d03ddd2fd0dc117888ec737f4.zip | |
clk: Don't set clk->new_rate twice
if (!clk->ops->round_rate && (clk->flags & CLK_SET_RATE_PARENT)) is true, then
we don't need to set clk->new_rate here, as we will call clk_calc_subtree()
afterwards and it also sets clk->new_rate.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index c6e8866289b4..2dd20c01134d 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -790,7 +790,7 @@ static struct clk *clk_calc_new_rates(struct clk *clk, unsigned long rate) if (!clk->ops->round_rate) { top = clk_calc_new_rates(clk->parent, rate); - new_rate = clk->new_rate = clk->parent->new_rate; + new_rate = clk->parent->new_rate; goto out; } |