aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChaotian Jing <chaotian.jing@mediatek.com>2016-05-19 16:47:42 +0800
committerUlf Hansson <ulf.hansson@linaro.org>2016-07-25 10:34:09 +0200
commit987aa5f8059613bf85cbb6f64ffbd34f5cb7a9d1 (patch)
tree43268936b258f5881a56142dcb7a07e7c8ca1468
parent08573eaf1a70104f83fdbee9b84e5be03480e9ed (diff)
downloadkernel_i9300_mainline-987aa5f8059613bf85cbb6f64ffbd34f5cb7a9d1.zip
kernel_i9300_mainline-987aa5f8059613bf85cbb6f64ffbd34f5cb7a9d1.tar.gz
kernel_i9300_mainline-987aa5f8059613bf85cbb6f64ffbd34f5cb7a9d1.tar.bz2
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>
-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 32de144..ad6e979 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -534,7 +534,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 {
/*
* Due to the possibility of being preempted after