diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index e26379d1461d..c6cf371a3e20 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1955,6 +1955,7 @@ static int mmc_suspend(struct mmc_host *host) static int _mmc_resume(struct mmc_host *host) { int err = 0; + int i; BUG_ON(!host); BUG_ON(!host->card); @@ -1964,8 +1965,22 @@ static int _mmc_resume(struct mmc_host *host) if (!mmc_card_suspended(host->card)) goto out; - mmc_power_up(host, host->card->ocr); - err = mmc_init_card(host, host->card->ocr, host->card); + /* + * Let's try to fallback the host->f_init + * if failing to init mmc card after resume. + */ + for (i = 0; i < ARRAY_SIZE(freqs); i++) { + if (host->f_init < max(freqs[i], host->f_min)) + continue; + else + host->f_init = max(freqs[i], host->f_min); + + mmc_power_up(host, host->card->ocr); + err = mmc_init_card(host, host->card->ocr, host->card); + if (!err) + break; + } + mmc_card_clr_suspended(host->card); out: