Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / drivers / mmc / core / sdio.c

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 2439e71..fd0750b 100644 (file)
--- 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);
@@ -1035,7 +1039,7 @@ static int mmc_sdio_power_restore(struct mmc_host *host)
 
        sdio_reset(host);
        mmc_go_idle(host);
-       mmc_send_if_cond(host, host->ocr_avail);
+       mmc_send_if_cond(host, host->card->ocr);
 
        ret = mmc_send_io_op_cond(host, 0, NULL);
        if (ret)