diff options
-rw-r--r-- | drivers/mmc/core/sdio.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index f332c52968b7..3be1571e4a51 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c | |||
@@ -456,7 +456,6 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, | |||
456 | return -ENOENT; | 456 | return -ENOENT; |
457 | 457 | ||
458 | card = oldcard; | 458 | card = oldcard; |
459 | return 0; | ||
460 | } | 459 | } |
461 | 460 | ||
462 | if (card->type == MMC_TYPE_SD_COMBO) { | 461 | if (card->type == MMC_TYPE_SD_COMBO) { |
@@ -614,14 +613,6 @@ static int mmc_sdio_resume(struct mmc_host *host) | |||
614 | mmc_claim_host(host); | 613 | mmc_claim_host(host); |
615 | err = mmc_sdio_init_card(host, host->ocr, host->card, | 614 | err = mmc_sdio_init_card(host, host->ocr, host->card, |
616 | (host->pm_flags & MMC_PM_KEEP_POWER)); | 615 | (host->pm_flags & MMC_PM_KEEP_POWER)); |
617 | if (!err) { | ||
618 | /* We may have switched to 1-bit mode during suspend. */ | ||
619 | err = sdio_enable_4bit_bus(host->card); | ||
620 | if (err > 0) { | ||
621 | mmc_set_bus_width(host, MMC_BUS_WIDTH_4); | ||
622 | err = 0; | ||
623 | } | ||
624 | } | ||
625 | if (!err && host->sdio_irqs) | 616 | if (!err && host->sdio_irqs) |
626 | mmc_signal_sdio_irq(host); | 617 | mmc_signal_sdio_irq(host); |
627 | mmc_release_host(host); | 618 | mmc_release_host(host); |