summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2012-03-14 15:08:26 -0700
committerColin Cross <ccross@android.com>2012-04-09 13:58:02 -0700
commit09cc1c88758916bf193f742fe57d21bbbb42446e (patch)
treead70596c14f7f28c0637181cc1923c3502293624 /drivers/mmc
parent74b370e31ca370cb64934b9ed4662f9d3685a4d9 (diff)
mmc: sdhci: remove too large timeout warning
Some MMC cards specify timeouts that are larger than the highest possible timeout in the host controller. sdhci is the only host controller driver which complains about this; remove the warning to match the behaviour of the other drivers. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 9aa77f3f04a..2e8cde3386c 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -679,11 +679,8 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)
break;
}
- if (count >= 0xF) {
- pr_warning("%s: Too large timeout requested for CMD%d!\n",
- mmc_hostname(host->mmc), cmd->opcode);
+ if (count >= 0xF)
count = 0xE;
- }
return count;
}