diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-07 03:21:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-07 03:21:45 -0700 |
| commit | 73ae7e2aaf88f448361d8a3d7b9f2837e2a96327 (patch) | |
| tree | ab39236fdd9eec25e109bb6600ced828e759d88e | |
| parent | 54ac6d78bab5507ed8898efb11a3e206a2fcb233 (diff) | |
| parent | 76b1b5d7106677177e47630aa7ad02507dd08957 (diff) | |
Merge "mmc: host: Add check for post tuning in HS400"
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 14ed8e775e6a..0542ba51445f 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2337,9 +2337,10 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) switch (host->timing) { /* HS400 tuning is done in HS200 mode */ case MMC_TIMING_MMC_HS400: - err = -EINVAL; - goto out_unlock; - + if (!(mmc->caps2 & MMC_CAP2_HS400_POST_TUNING)) { + err = -EINVAL; + goto out_unlock; + } case MMC_TIMING_MMC_HS200: /* * Periodic re-tuning for HS400 is not expected to be needed, so |