From e6f29a8dc1602e170daf955233891a9130573a55 Mon Sep 17 00:00:00 2001 From: Michal Miroslaw Date: Thu, 2 Dec 2010 23:38:12 +0100 Subject: mmc: fix detection of memory part of SD-combo card with broken SDIO In case of failure, mmc_attach_sdio() will power off the SD bus. Power it up and reinitialize before trying SD memory detection. Reported-by: Sahitya Tummala Signed-off-by: Michał Mirosław Reviewed-by: Chris Ball Signed-off-by: Chris Ball --- drivers/mmc/core/core.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers/mmc') diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 241ffb28351c..97e0624eb9b6 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1569,6 +1569,11 @@ void mmc_rescan(struct work_struct *work) * Try SDMEM (but not MMC) even if SDIO * is broken. */ + mmc_power_up(host); + sdio_reset(host); + mmc_go_idle(host); + mmc_send_if_cond(host, host->ocr_avail); + if (mmc_send_app_op_cond(host, 0, &ocr)) goto out_fail; -- cgit v1.2.3-55-g7522