diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2016-06-21 15:12:50 +0200 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2016-07-25 10:34:25 +0200 |
commit | 52e00b84187316d7ade1e715651c07b66b5b3e17 (patch) | |
tree | 9dde9ed7155152e50155b43816e6bdee3912bca0 /drivers/mmc/host/sh_mmcif.c | |
parent | 549646a9c79d4649b41f9e817f0588ac0cc6a235 (diff) | |
download | linux-52e00b84187316d7ade1e715651c07b66b5b3e17.tar.gz linux-52e00b84187316d7ade1e715651c07b66b5b3e17.tar.bz2 linux-52e00b84187316d7ade1e715651c07b66b5b3e17.zip |
mmc: sh_mmcif: Use a 10s timeout in the error recovery path
The current value means an mdelay(1) may execute up to 10000000 times,
which translates to around ~2.8 hours. This is probably not what the
orignal author had in mind. Let's instead use 10s, which is the same value
sh_mmcif is using for other timeouts.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sh_mmcif.c')
-rw-r--r-- | drivers/mmc/host/sh_mmcif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index bab971bdd5f1..900778421be6 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -574,7 +574,7 @@ static int sh_mmcif_error_manage(struct sh_mmcif_host *host) if (state1 & STS1_CMDSEQ) { sh_mmcif_bitset(host, MMCIF_CE_CMD_CTRL, CMD_CTRL_BREAK); sh_mmcif_bitset(host, MMCIF_CE_CMD_CTRL, ~CMD_CTRL_BREAK); - for (timeout = 10000000; timeout; timeout--) { + for (timeout = 10000; timeout; timeout--) { if (!(sh_mmcif_readl(host->addr, MMCIF_CE_HOST_STS1) & STS1_CMDSEQ)) break; |