From eb35cf399f8b727351d1c9678bc258ff9ee8ab1c Mon Sep 17 00:00:00 2001 From: Balaji T K Date: Thu, 8 Sep 2011 22:08:39 +0530 Subject: [PATCH] --- yaml --- r: 270261 b: refs/heads/master c: c3805467aad7ce4e31c2b935046843de08cfc026 h: refs/heads/master i: 270259: d27e582bc9ae650b72bef71588e5e526a4751935 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/mmc.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cdeca1dd7bed..2b158578800d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fe47179a07009ee3ee7c8b962966fee420becc8 +refs/heads/master: c3805467aad7ce4e31c2b935046843de08cfc026 diff --git a/trunk/drivers/mmc/core/mmc.c b/trunk/drivers/mmc/core/mmc.c index 5700b1cbdfec..f73fceea5dbd 100644 --- a/trunk/drivers/mmc/core/mmc.c +++ b/trunk/drivers/mmc/core/mmc.c @@ -553,6 +553,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, * need to tell some cards to go back to the idle * state. We wait 1ms to give cards time to * respond. + * mmc_go_idle is needed for eMMC that are asleep */ mmc_go_idle(host); @@ -900,16 +901,20 @@ static void mmc_detect(struct mmc_host *host) */ static int mmc_suspend(struct mmc_host *host) { + int err = 0; + BUG_ON(!host); BUG_ON(!host->card); mmc_claim_host(host); - if (!mmc_host_is_spi(host)) + if (mmc_card_can_sleep(host)) + err = mmc_card_sleep(host); + else if (!mmc_host_is_spi(host)) mmc_deselect_cards(host); host->card->state &= ~MMC_STATE_HIGHSPEED; mmc_release_host(host); - return 0; + return err; } /*