From: Peter De Schrijver <pdeschrijver@nvidia.com>
Date: Wed, 5 Jun 2013 15:06:36 +0000 (+0300)
Subject: clk: honor CLK_GET_RATE_NOCACHE in clk_set_rate
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=34e452a152efd25d654b7bc809df429337115b03;p=linux-beck.git

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>
---

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 9b2f94197dbf..2e669a87fb15 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1216,7 +1216,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) {