diff options
author | Viresh Kumar <viresh.kumar@st.com> | 2012-04-17 07:15:38 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2012-04-24 19:37:41 -0400 |
commit | 1b2f99037a29d48d03ddd2fd0dc117888ec737f4 (patch) | |
tree | e914fe01d0cda61112866d4db1e2e6b71d7db57d /drivers/clk/clk.c | |
parent | 182f9e8cd5e451911a37f121f942409205ede0d6 (diff) |
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/clk.c')
-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) | |||
790 | 790 | ||
791 | if (!clk->ops->round_rate) { | 791 | if (!clk->ops->round_rate) { |
792 | top = clk_calc_new_rates(clk->parent, rate); | 792 | top = clk_calc_new_rates(clk->parent, rate); |
793 | new_rate = clk->new_rate = clk->parent->new_rate; | 793 | new_rate = clk->parent->new_rate; |
794 | 794 | ||
795 | goto out; | 795 | goto out; |
796 | } | 796 | } |