From def9fcaa479a7c180ea3156035e5905a5e329989 Mon Sep 17 00:00:00 2001 From: Veerabhadrarao Badiganti Date: Sat, 7 Apr 2018 19:09:13 +0530 Subject: mmc: core: Return SD card status if sdr104_wa is not present On the targets in which sdr104 workaround is not needed, we simply return card status from mmc_recovery_fallback_lower_speed() call. This is to fix the issue that are observed with SD card tray holder. (1b6281740: mmc: core: Return card status if sdr104_wa is not present) Since this change is meant to fix issue observed with SD card tray holder, for other devices(eMMC/SDIO) we should ignore this. Change-Id: Ia7fcdfab4351cbb3df241f2e9f2da74bad20ca90 Signed-off-by: Veerabhadrarao Badiganti --- drivers/mmc/core/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 3dee072ce841..25150b51523c 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -486,7 +486,7 @@ int mmc_recovery_fallback_lower_speed(struct mmc_host *host) mmc_host_clear_sdr104(host); err = mmc_hw_reset(host); host->card->sdr104_blocked = true; - } else { + } else if (mmc_card_sd(host->card)) { /* If sdr104_wa is not present, just return status */ err = host->bus_ops->alive(host); } -- cgit v1.2.3