---

yaml --- r: 210439 b: refs/heads/master c: f3c65b2 h: refs/heads/master i: 210437: a8bcb71 210435: e6cbe05 210431: 45cf26c v: v3
git-mirror · Sep 10, 2010 · 80816f3 · 80816f3
1 parent a6c2f24
commit 80816f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 152831be91dfe864e06c3b3ff2bf994e04df4cdf
+refs/heads/master: f3c65b2870f2481f3646bc410a58a12989ecc704
diff --git a/trunk/drivers/mmc/core/sdio.c b/trunk/drivers/mmc/core/sdio.c
@@ -362,9 +362,8 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
 		goto err;
 	}
 
-	err = mmc_sd_get_cid(host, host->ocr & ocr, card->raw_cid);
-
-	if (!err) {
+	if (ocr & R4_MEMORY_PRESENT
+	    && mmc_sd_get_cid(host, host->ocr & ocr, card->raw_cid) == 0) {
 		card->type = MMC_TYPE_SD_COMBO;
 
 		if (oldcard && (oldcard->type != MMC_TYPE_SD_COMBO ||

diff --git a/trunk/include/linux/mmc/sdio.h b/trunk/include/linux/mmc/sdio.h
@@ -38,6 +38,8 @@
  *      [8:0] Byte/block count
  */
 
+#define R4_MEMORY_PRESENT (1 << 27)
+
 /*
   SDIO status in R5
   Type
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,8 @@ @@
      *      [8:0] Byte/block count
      */
+    #define R4_MEMORY_PRESENT (1 << 27)
     /*
       SDIO status in R5
       Type
@@ Expand Down @@