From 80816f3562071e6d4aa677dd9e25893bcdbca6e8 Mon Sep 17 00:00:00 2001 From: David Vrabel Date: Thu, 9 Sep 2010 16:37:24 -0700 Subject: [PATCH] --- yaml --- r: 210439 b: refs/heads/master c: f3c65b2870f2481f3646bc410a58a12989ecc704 h: refs/heads/master i: 210437: a8bcb71289cd7780338925779140ea4f3e70ec23 210435: e6cbe0554507bd35dd1fceec40234def3c915f0b 210431: 45cf26c7e63351cc7e6022d4b8bfd9a293f3eb88 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/sdio.c | 5 ++--- trunk/include/linux/mmc/sdio.h | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bc198c5f9dcd..3f7348855d94 100644 --- 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 index bd2755e8d9a3..f332c52968b7 100644 --- 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 index 329a8faa6e37..245cdacee544 100644 --- 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