1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 06b64085a355..7d8ba64b0170 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -224,7 +224,7 @@ static int sdio_enable_hs(struct mmc_card *card)
  * we're trying to reinitialise.
  */
 static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
-                              struct mmc_card *oldcard)
+                              struct mmc_card *oldcard, int powered_resume)
 {
         struct mmc_card *card;
         int err;
@@ -235,9 +235,11 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
         /*
          * Inform the card of the voltage
          */
-        err = mmc_send_io_op_cond(host, host->ocr, &ocr);
-        if (err)
-                goto err;
+        if (!powered_resume) {
+                err = mmc_send_io_op_cond(host, host->ocr, &ocr);
+                if (err)
+                        goto err;
+        }
 
         /*
          * For SPI, enable CRC as appropriate.
@@ -262,7 +264,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
         /*
          * For native busses:  set card RCA and quit open drain mode.
          */
-        if (!mmc_host_is_spi(host)) {
+        if (!powered_resume && !mmc_host_is_spi(host)) {
                 err = mmc_send_relative_addr(host, &card->rca);
                 if (err)
                         goto remove;
@@ -273,7 +275,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
         /*
          * Select card, as all following commands rely on that.
          */
-        if (!mmc_host_is_spi(host)) {
+        if (!powered_resume && !mmc_host_is_spi(host)) {
                 err = mmc_select_card(card);
                 if (err)
                         goto remove;
@@ -437,7 +439,8 @@ static int mmc_sdio_resume(struct mmc_host *host)
 
         /* Basic card reinitialization. */
         mmc_claim_host(host);
-        err = mmc_sdio_init_card(host, host->ocr, host->card);
+        err = mmc_sdio_init_card(host, host->ocr, host->card,
+                                 (host->pm_flags & MMC_PM_KEEP_POWER));
         mmc_release_host(host);
 
         /*
@@ -507,7 +510,7 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
         /*
          * Detect and init the card.
          */
-        err = mmc_sdio_init_card(host, host->ocr, NULL);
+        err = mmc_sdio_init_card(host, host->ocr, NULL, 0);
         if (err)
                 goto err;
         card = host->card;