---

yaml --- r: 336320 b: refs/heads/master c: ccb52a0 h: refs/heads/master v: v3
git-mirror · Dec 6, 2012 · 9f5ee5c · 9f5ee5c
1 parent bca3281
commit 9f5ee5c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 780f22af85991be4f7c51c512726eee931707fff
+refs/heads/master: ccb52a00fd3fdea428e29816cbacb0a78090d474
diff --git a/trunk/drivers/mmc/core/mmc.c b/trunk/drivers/mmc/core/mmc.c
@@ -1066,6 +1066,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
 	if (mmc_card_highspeed(card) || mmc_card_hs200(card)) {
 		if (max_dtr > card->ext_csd.hs_max_dtr)
 			max_dtr = card->ext_csd.hs_max_dtr;
+		if (mmc_card_highspeed(card) && (max_dtr > 52000000))
+			max_dtr = 52000000;
 	} else if (max_dtr > card->csd.max_dtr) {
 		max_dtr = card->csd.max_dtr;
 	}