diff options
| author |   Ohad Ben-Cohen <ohad@wizery.com> | 2010-10-02 13:54:12 +0200 |
|---|---|---|
| committer |   Chris Ball <cjb@laptop.org> | 2010-10-23 21:11:18 +0800 |
| commit | 87973ba27b751353e2915cb3aa5c0e0dc6a79a4f (patch) | |
| tree | 02c84b25c7697eed2c82d08ae5bf4308e6efe9fd /drivers/mmc | |
| parent | mmc: sdio: enable runtime PM for SDIO functions (diff) | |
| download | linux-dev-87973ba27b751353e2915cb3aa5c0e0dc6a79a4f.tar.xz linux-dev-87973ba27b751353e2915cb3aa5c0e0dc6a79a4f.zip | |
mmc: sdio: ensure mmc_sdio_detect is powered
To prevent an erroneous removal of the card, make sure
the device is powered when it is mmc_sdio_detect()ed.
This is required since mmc_sdio_detect may be invoked
while the device is runtime suspended (e.g., MMC core
is rescanning when system comes out of suspend).
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Tested-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/sdio.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 85561dde4c9d..c3ad1058cd31 100644 --- a/drivers/mmc/core/sdio.c +++ b/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); } /* |