Skip to content

Commit

Permalink
mmc: sdio: fix nasty oops in mmc_sdio_detect
Browse files Browse the repository at this point in the history
Power off the card in mmc_sdio_detect __before__ a potential error
handler, which completely removes the card, executes, and only if the
card was successfully powered on beforehand.

While we're at it, use the _sync variant of the runtime PM put API, in
order to ensure that the card is left powered off in case an error
occurred, and the card is going to be removed.

Reproduced and tested on the OLPC XO-1.5.

Reported-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Ohad Ben-Cohen authored and Chris Ball committed Nov 19, 2010
1 parent b432b4b commit 4d0812c
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions drivers/mmc/core/sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,19 @@ static void mmc_sdio_detect(struct mmc_host *host)

mmc_release_host(host);

/*
* Tell PM core it's OK to power off the card now.
*
* The _sync variant is used in order to ensure that the card
* is left powered off in case an error occurred, and the card
* is going to be removed.
*
* Since there is no specific reason to believe a new user
* is about to show up at this point, the _sync variant is
* desirable anyway.
*/
pm_runtime_put_sync(&host->card->dev);

out:
if (err) {
mmc_sdio_remove(host);
Expand All @@ -568,9 +581,6 @@ 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);
}

/*
Expand Down

0 comments on commit 4d0812c

Please sign in to comment.