summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-04-23 01:14:48 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-04-23 01:14:47 -0700
commit502257f3e6a9fbc83bdf42d98aef495c8dcecf11 (patch)
tree57d18dc40f00c7d2d513f2bfc20c7977c3c92dab
parente30750c55d27b474184135e0425335e757a94067 (diff)
parent7b76e6a40f9f54bbe3f9e440f1a0991388e0ece4 (diff)
Merge "mmc: core: Donot fall back to lower speed modes for tuning errors"
-rw-r--r--drivers/mmc/core/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 36dfa122c28f..2af0e819d0cb 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1599,7 +1599,8 @@ static void mmc_wait_for_req_done(struct mmc_host *host,
mmc_card_removed(host->card)) {
if (cmd->error && !cmd->retries &&
cmd->opcode != MMC_SEND_STATUS &&
- cmd->opcode != MMC_SEND_TUNING_BLOCK)
+ cmd->opcode != MMC_SEND_TUNING_BLOCK &&
+ cmd->opcode != MMC_SEND_TUNING_BLOCK_HS200)
mmc_recovery_fallback_lower_speed(host);
break;
}