From: Viresh Kumar Date: Wed, 11 Apr 2012 10:33:42 +0000 (+0530) Subject: clk: clk_set_rate() must fail if CLK_SET_RATE_GATE is set and clk is enabled X-Git-Tag: v3.5-rc1~71^2~6^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e1c03017549a9df513622b3f15ff38eb8d35a62;p=platform%2Fkernel%2Flinux-exynos.git clk: clk_set_rate() must fail if CLK_SET_RATE_GATE is set and clk is enabled This is well documented but isn't implemented. clk_set_rate() must check if flags have CLK_SET_RATE_GATE bit set and is enabled too. Signed-off-by: Viresh Kumar Signed-off-by: Mike Turquette --- diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index c81803b..8149764 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -900,6 +900,11 @@ int clk_set_rate(struct clk *clk, unsigned long rate) if (rate == clk->rate) goto out; + if ((clk->flags & CLK_SET_RATE_GATE) && __clk_is_enabled(clk)) { + ret = -EBUSY; + goto out; + } + /* calculate new rates and get the topmost changed clock */ top = clk_calc_new_rates(clk, rate); if (!top) {