From 6f3b9fbe7aaa56046335a331a95547ff09c2c3de Mon Sep 17 00:00:00 2001 From: Chaotian Jing Date: Thu, 19 May 2016 16:47:42 +0800 Subject: [PATCH] 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 Signed-off-by: Ziyuan Xu --- drivers/mmc/core/mmc_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { /* -- 2.34.1