commit | d03ccd7031908878b6871bdd2bdb7a81737bc7ab | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Sat Nov 17 15:04:01 2012 -0800 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Sat Nov 17 15:04:01 2012 -0800 |
tree | 51a53c400e458c871e73305ea03bb49f0bda830b | |
parent | fb9261113ce2b3e2f98a8e94a3e93d4e594a992b [diff] | |
parent | 10d7fed5ec60c6eeb9cf960c59a7609db6524d5d [diff] |
Merge "mmc: sdhci: remove too large timeout warning"
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 6df3410..6ac4dab 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c
@@ -653,9 +653,7 @@ break; } - if (count >= 0xF) { - printk(KERN_WARNING "%s: Too large timeout requested for CMD%d!\n", - mmc_hostname(host->mmc), cmd->opcode); + if (count >= 0xF) count = 0xE; return count;