From 4bb9aa64e948f67442b5b7868a7d06815f457248 Mon Sep 17 00:00:00 2001
From: Subhash Jadavani <subhashj@codeaurora.org>
Date: Wed, 10 Aug 2011 11:16:01 +0530
Subject: [PATCH] --- yaml --- r: 270303 b: refs/heads/master c:
 f2815f68dabbb373fd1c9f0fd4a609d486697c2b h: refs/heads/master i:   270301:
 8532ad9e044ebe479fc6a7c3c3388abe629c9c37   270299:
 177b98651e9e12348ad4daf6b68670efda48ad59   270295:
 d3030e872f85e3bca970026aa80557b34e41b1c0   270287:
 e19a741595d6b078006ae29ac88a01fed898cfd6   270271:
 bdb7c70fd4ddedfa399f036d78b2b948ad20f718 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mmc/core/sd.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6dd9af4b2968..3ba0598afa48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb0d8f135b6730d6d0324a064664d121334290e7
+refs/heads/master: f2815f68dabbb373fd1c9f0fd4a609d486697c2b
diff --git a/trunk/drivers/mmc/core/sd.c b/trunk/drivers/mmc/core/sd.c
index 25b937294130..a230e7f9d77a 100644
--- a/trunk/drivers/mmc/core/sd.c
+++ b/trunk/drivers/mmc/core/sd.c
@@ -306,6 +306,9 @@ static int mmc_read_switch(struct mmc_card *card)
 		goto out;
 	}
 
+	if (status[13] & UHS_SDR50_BUS_SPEED)
+		card->sw_caps.hs_max_dtr = 50000000;
+
 	if (card->scr.sda_spec3) {
 		card->sw_caps.sd3_bus_mode = status[13];
 
@@ -348,9 +351,6 @@ static int mmc_read_switch(struct mmc_card *card)
 		}
 
 		card->sw_caps.sd3_curr_limit = status[7];
-	} else {
-		if (status[13] & 0x02)
-			card->sw_caps.hs_max_dtr = 50000000;
 	}
 
 out: