diff options
| author | Chaotian Jing <chaotian.jing@mediatek.com> | 2016-05-19 16:47:42 +0800 |
|---|---|---|
| committer | Haibo Chen <haibo.chen@nxp.com> | 2016-06-29 11:14:40 +0800 |
| commit | 38f639884a2cfd65cbe29ac2fbfe4ab3fcb1f1af (patch) | |
| tree | 1f199b4ac10f449ceaeb1f0d0e7dbc0f99e3f04e /drivers | |
| parent | b9b8249b98b9128d8931887eccb38cd45a0f8bf3 (diff) | |
mmc: mmc: fix switch timeout issue caused by jiffies precision
with CONFIG_HZ=100, the precision of jiffies is 10ms, and the
generic_cmd6_time of some card is also 10ms. then, may be current
time is only 5ms, but already timed out caused by jiffies precision.
Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit 8bcce64faaaf07165453e6600ae9ffb887e79b1a)
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/core/mmc_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 72f6785e7014..cd5280f686d7 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -549,7 +549,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, timeout_ms = MMC_OPS_TIMEOUT_MS; /* Must check status to be sure of no errors. */ - timeout = jiffies + msecs_to_jiffies(timeout_ms); + timeout = jiffies + msecs_to_jiffies(timeout_ms) + 1; do { if (send_status) { /* |