summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChaotian Jing <chaotian.jing@mediatek.com>2016-05-19 16:47:42 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-03 06:23:24 +0200
commit695fc282c337c5f520582eaf3bda9b53319384e4 (patch)
tree85b6b244c961e108e3bae8e237e67a25935ed11a
parentc89eceddfaeb07249b5043d98f8b51e7d04ec386 (diff)
mmc: mmc: fix switch timeout issue caused by jiffies precision
[ Upstream commit 987aa5f8059613bf85cbb6f64ffbd34f5cb7a9d1 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/mmc/core/mmc_ops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 1f444269ebbe..76b49b9772d0 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -542,7 +542,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) {
err = __mmc_send_status(card, &status, ignore_crc);