aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core/sdio.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc/core/sdio.c')
-rw-r--r--drivers/mmc/core/sdio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 0f7d4362d213..4221670bf82e 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -625,7 +625,7 @@ static int mmc_sdio_suspend(struct mmc_host *host)
625 } 625 }
626 } 626 }
627 627
628 if (!err && mmc_card_keep_power(host)) { 628 if (!err && mmc_card_keep_power(host) && mmc_card_wake_sdio_irq(host)) {
629 mmc_claim_host(host); 629 mmc_claim_host(host);
630 sdio_disable_wide(host->card); 630 sdio_disable_wide(host->card);
631 mmc_release_host(host); 631 mmc_release_host(host);
@@ -648,7 +648,7 @@ static int mmc_sdio_resume(struct mmc_host *host)
648 if (mmc_card_is_removable(host) || !mmc_card_keep_power(host)) 648 if (mmc_card_is_removable(host) || !mmc_card_keep_power(host))
649 err = mmc_sdio_init_card(host, host->ocr, host->card, 649 err = mmc_sdio_init_card(host, host->ocr, host->card,
650 mmc_card_keep_power(host)); 650 mmc_card_keep_power(host));
651 else if (mmc_card_keep_power(host)) { 651 else if (mmc_card_keep_power(host) && mmc_card_wake_sdio_irq(host)) {
652 /* We may have switched to 1-bit mode during suspend */ 652 /* We may have switched to 1-bit mode during suspend */
653 err = sdio_enable_4bit_bus(host->card); 653 err = sdio_enable_4bit_bus(host->card);
654 if (err > 0) { 654 if (err > 0) {