---

yaml --- r: 308213 b: refs/heads/master c: 0e1c030 h: refs/heads/master i: 308211: 876caf0 v: v3
git-mirror · May 2, 2012 · eca52c0 · eca52c0
1 parent 9529a81
commit eca52c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0197b3ea0f66cd2a11417f58fe1812858ea77908
+refs/heads/master: 0e1c03017549a9df513622b3f15ff38eb8d35a62
diff --git a/trunk/drivers/clk/clk.c b/trunk/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) {