mmc: mmc: fix switch timeout issue caused by jiffies precision

commit 987aa5f8059613bf85cbb6f64ffbd34f5cb7a9d1 upstream.

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>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index f51b5ba3bbea99ce1f2b74e5b3c80a4b882b972c..ae3288285b5009774b614180c29eb3edb319d394 100644 (file)
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -470,7 +470,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);