From: Jerry Huang <Chang-Ming.Huang@xxxxxxxxxxxxx> 1. when f_init is zero, the SDHC can't work correctly, so f_min will replace it. 2. Before running get_cd recall function to detect if the card is present, must make sure the power is up. Signed-off-by: Jerry Huang <Chang-Ming.Huang@xxxxxxxxxxxxx> --- drivers/mmc/core/core.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 1f453ac..5a22b85 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -993,7 +993,10 @@ static void mmc_power_up(struct mmc_host *host) */ mmc_delay(10); - host->ios.clock = host->f_init; + if (host->f_init) + host->ios.clock = host->f_init; + else + host->ios.clock = host->f_min; host->ios.power_mode = MMC_POWER_ON; mmc_set_ios(host); @@ -1571,8 +1574,10 @@ void mmc_rescan(struct work_struct *work) */ mmc_bus_put(host); + mmc_power_up(host); if (host->ops->get_cd && host->ops->get_cd(host) == 0) goto out; + mmc_power_off(host); mmc_claim_host(host); for (i = 0; i < ARRAY_SIZE(freqs); i++) { -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html