diff options
| author | Chaotian Jing <chaotian.jing@mediatek.com> | 2016-05-19 16:47:42 +0800 |
|---|---|---|
| committer | Ziyuan Xu <xzy.xu@rock-chips.com> | 2016-08-12 09:32:35 +0800 |
| commit | 6f3b9fbe7aaa56046335a331a95547ff09c2c3de (patch) | |
| tree | 73a3cb08e99abc77357f8fa3be93e4a9d8723ef2 /drivers/mmc/core | |
| parent | 8a1eecaf86bbe3dc42043acac59473034ebc2e6a (diff) | |
UPSTREAM: 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.
(cherry picked from commit 987aa5f8059613bf85cbb6f64ffbd34f5cb7a9d1)
Change-Id: I43f1bc93e1100e86b138ec20a37612338a7153c6
Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Diffstat (limited to 'drivers/mmc/core')
| -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 2c90635c89af..2db16bfc855b 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -543,7 +543,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) { /* |