Commit f38a9774 authored by Chaotian Jing's avatar Chaotian Jing Committed by Ulf Hansson
Browse files

mmc: mediatek: fix cannot receive new request when msdc_cmd_is_ready fail 



when msdc_cmd_is_ready return fail, the req_timeout work has not been
inited and cancel_delayed_work() will return false, then, the request
return directly and never call mmc_request_done().

so need call mod_delayed_work() before msdc_cmd_is_ready()

Signed-off-by: default avatarChaotian Jing <chaotian.jing@mediatek.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 56f6cbbe

drivers/mmc/host/mtk-sd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1059,6 +1059,7 @@ static void msdc_start_command(struct msdc_host *host, 
	WARN_ON(host->cmd);

	WARN_ON(host->cmd);

	host->cmd = cmd;

	host->cmd = cmd;





	mod_delayed_work(system_wq, &host->req_timeout, DAT_TIMEOUT);

	if (!msdc_cmd_is_ready(host, mrq, cmd))

	if (!msdc_cmd_is_ready(host, mrq, cmd))

		return;

		return;
@@ -1070,7 +1071,6 @@ static void msdc_start_command(struct msdc_host *host, 




	cmd->error = 0;

	cmd->error = 0;

	rawcmd = msdc_cmd_prepare_raw_cmd(host, mrq, cmd);

	rawcmd = msdc_cmd_prepare_raw_cmd(host, mrq, cmd);

	mod_delayed_work(system_wq, &host->req_timeout, DAT_TIMEOUT);





	sdr_set_bits(host->base + MSDC_INTEN, cmd_ints_mask);

	sdr_set_bits(host->base + MSDC_INTEN, cmd_ints_mask);

	writel(cmd->arg, host->base + SDC_ARG);

	writel(cmd->arg, host->base + SDC_ARG);