summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-11-29 15:24:44 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-11-29 15:24:44 -0800
commitc414a49eded39536e4e1a0c7ad7ab4370212dc22 (patch)
tree506ffe9899cc46acfb7992318c4aecac8f27bfcf
parent9dc5296df5901fec3591d48b14e17dd7821ccfcb (diff)
parente773b0dbb9f4168327b126696d351e1c5285f207 (diff)
Merge "mmc: core: Return card status if sdr104_wa is not present"
-rw-r--r--drivers/mmc/core/core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 8c6861564ed2..260a434f31db 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -478,6 +478,9 @@ 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 {
+ /* If sdr104_wa is not present, just return status */
+ err = host->bus_ops->alive(host);
}
if (err)
pr_err("%s: %s: Fallback to lower speed mode failed with err=%d\n",