From: Shawn Lin <shawn.lin@rock-chips.com>
Date: Mon, 8 Jun 2015 09:52:06 +0000 (+0800)
Subject: mmc: core: limit tuning block timeout
X-Git-Tag: firefly_0821_release~3997
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fef082090f9a1f80661c58177484610a1ab34ec3;p=firefly-linux-kernel-4.4.55.git

mmc: core: limit tuning block timeout

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 21233c158987..33bdf60c8096 100755
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -474,6 +474,9 @@ static void mmc_get_req_timeout(struct mmc_request *mrq, u32 *timeout)
 	if ((mrq->cmd->opcode == SD_IO_RW_DIRECT) ||
 	    (mrq->cmd->opcode == SD_IO_RW_EXTENDED))
 		*timeout = 8000;
+	else if ((mrq->cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200) ||
+		 (mrq->cmd->opcode == MMC_SEND_TUNING_BLOCK))
+		*timeout = 100;
 }
 
 static void mmc_wait_for_req_done(struct mmc_host *host,