---

yaml --- r: 225780 b: refs/heads/master c: 991a86e h: refs/heads/master v: v3
git-mirror · Dec 19, 2010 · 7009fd6 · 7009fd6
1 parent 3ec5f1e
commit 7009fd6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b70a67f938e4a7544ca4dea2856b88f3c47669ff
+refs/heads/master: 991a86e182203913b71607f0695955d7e23075d7
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
@@ -101,13 +101,7 @@ static void mmci_set_clkreg(struct mmci_host *host, unsigned int desired)
 
 	if (desired) {
 		if (desired >= host->mclk) {
-			/*
-			 * The ST clock divider does not like the bypass bit,
-			 * even though it's available. Instead the datasheet
-			 * recommends setting the divider to zero.
-			 */
-			if (!variant->st_clkdiv)
-				clk = MCI_CLK_BYPASS;
+			clk = MCI_CLK_BYPASS;
 			host->cclk = host->mclk;
 		} else if (variant->st_clkdiv) {
 			/*