summaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorPeter De Schrijver <pdeschrijver@nvidia.com>2013-06-05 18:06:36 +0300
committerChanho Park <chanho61.park@samsung.com>2014-03-20 17:34:11 +0900
commitfcd58f2cf55814aceb7063c5e887bdda0884a1c1 (patch)
treefece0eb7852f5c8bb219858de539ca14e9d6c39e /drivers/clk
parent8671c9449d8de684042475667f159f9e7ed5493b (diff)
downloadlinux-3.10-fcd58f2cf55814aceb7063c5e887bdda0884a1c1.tar.gz
linux-3.10-fcd58f2cf55814aceb7063c5e887bdda0884a1c1.tar.bz2
linux-3.10-fcd58f2cf55814aceb7063c5e887bdda0884a1c1.zip
clk: honor CLK_GET_RATE_NOCACHE in clk_set_rate
clk_set_rate() uses clk->rate directly. This causes problems if the clock is marked as CLK_GET_RATE_NOCACHE. Hence call clk_get_rate() to get the current rate. Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/clk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 8d790a8a4d9..5b39cda1c88 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1219,7 +1219,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
clk_prepare_lock();
/* bail early if nothing to do */
- if (rate == clk->rate)
+ if (rate == clk_get_rate(clk))
goto out;
if ((clk->flags & CLK_SET_RATE_GATE) && clk->prepare_count) {