---

yaml --- r: 132367 b: refs/heads/master c: efeff56 h: refs/heads/master i: 132365: 579573c 132363: 5595904 132359: e621481 132351: 885d237 v: v3
git-mirror · Feb 27, 2009 · 49dd115 · 49dd115
1 parent 0473812
commit 49dd115
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdca9bf2dae14218704ddd7dc60ad1b198c1d787
+refs/heads/master: efeff568677aa325f84d3ce37c219019887a79eb
diff --git a/trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c b/trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c
@@ -239,10 +239,12 @@ static int s3c64xx_setrate_clksrc(struct clk *clk, unsigned long rate)
 
 	rate = clk_round_rate(clk, rate);
 	div = clk_get_rate(clk->parent) / rate;
+	if (div > 16)
+		return -EINVAL;
 
 	val = __raw_readl(reg);
-	val &= ~sclk->mask;
-	val |= (rate - 1) << sclk->shift;
+	val &= ~(0xf << sclk->shift);
+	val |= (div - 1) << sclk->shift;
 	__raw_writel(val, reg);
 
 	return 0;