diff options
| author | NeilBrown <neilb@suse.de> | 2014-11-12 14:55:19 +1100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-11-26 14:30:59 +0100 |
| commit | 006fc51cb3ab42960fa4f246c772ad12e45a3a9b (patch) | |
| tree | 8e0df6c55a6cc8cc11e2061f07f14f35360f3fc7 | |
| parent | 59b6c9e0ad9f2578ff8b2ef8c718bcb8b895fefb (diff) | |
| download | op-kernel-dev-006fc51cb3ab42960fa4f246c772ad12e45a3a9b.zip op-kernel-dev-006fc51cb3ab42960fa4f246c772ad12e45a3a9b.tar.gz | |
mmc: core: reset sdio card properly on resume.
mmc_sdio_power_restore() calls
mmc_send_if_cond(host, host->card->ocr);
ret = mmc_send_io_op_cond(host, 0, NULL);
between mmc_go_idle() and mmc_sdio_init_card().
mmc_sdio_resume() needs to as well, else my libertas sdio wifi
device doesn't resume properly from suspend.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
| -rw-r--r-- | drivers/mmc/core/sdio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index f0ddb0d..fd0750b 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -980,8 +980,12 @@ static int mmc_sdio_resume(struct mmc_host *host) if (mmc_card_is_removable(host) || !mmc_card_keep_power(host)) { sdio_reset(host); mmc_go_idle(host); - err = mmc_sdio_init_card(host, host->card->ocr, host->card, - mmc_card_keep_power(host)); + mmc_send_if_cond(host, host->card->ocr); + err = mmc_send_io_op_cond(host, 0, NULL); + if (!err) + err = mmc_sdio_init_card(host, host->card->ocr, + host->card, + mmc_card_keep_power(host)); } else if (mmc_card_keep_power(host) && mmc_card_wake_sdio_irq(host)) { /* We may have switched to 1-bit mode during suspend */ err = sdio_enable_4bit_bus(host->card); |
