From 5a54741fe23694ed1f4f7d400f181a426eb074df Mon Sep 17 00:00:00 2001 From: Ohad Ben-Cohen Date: Sat, 2 Oct 2010 13:54:12 +0200 Subject: [PATCH] --- yaml --- r: 219011 b: refs/heads/master c: 87973ba27b751353e2915cb3aa5c0e0dc6a79a4f h: refs/heads/master i: 219009: 9aca56a0f05eb57d777b1513237694c94fc41389 219007: 2d1ec67f16320171ef935c6dac2e63d1c33553fd v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/sdio.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 57ecaacec53e..ed7174569c1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40bba0c1ca83a370f749c8bc9afda71cf79ebd91 +refs/heads/master: 87973ba27b751353e2915cb3aa5c0e0dc6a79a4f diff --git a/trunk/drivers/mmc/core/sdio.c b/trunk/drivers/mmc/core/sdio.c index 85561dde4c9d..c3ad1058cd31 100644 --- a/trunk/drivers/mmc/core/sdio.c +++ b/trunk/drivers/mmc/core/sdio.c @@ -546,6 +546,11 @@ static void mmc_sdio_detect(struct mmc_host *host) BUG_ON(!host); BUG_ON(!host->card); + /* Make sure card is powered before detecting it */ + err = pm_runtime_get_sync(&host->card->dev); + if (err < 0) + goto out; + mmc_claim_host(host); /* @@ -555,6 +560,7 @@ static void mmc_sdio_detect(struct mmc_host *host) mmc_release_host(host); +out: if (err) { mmc_sdio_remove(host); @@ -562,6 +568,9 @@ static void mmc_sdio_detect(struct mmc_host *host) mmc_detach_bus(host); mmc_release_host(host); } + + /* Tell PM core that we're done */ + pm_runtime_put(&host->card->dev); } /*