Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / core / sdio.c

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
old mode 100644 (file)
new mode 100755 (executable)
index b81f07c..da17bdd
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -822,6 +822,10 @@ int sdio_reset_comm(struct mmc_card *card)
 
        printk("%s():\n", __func__);
        mmc_claim_host(host);
+       
+#if defined(CONFIG_SDMMC_RK29) && !defined(CONFIG_SDMMC_RK29_OLD)
+       host->sdmmc_host_hw_init(mmc_priv(host));  //added by xbw , at 2011-10-18
+#endif
 
        mmc_go_idle(host);