Commit 6e5c951b authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: always flag retune when resetting and a card is present 



After reset, we manually flagged retune in runtime resume, but missed it
in the workqueue. To fix that and avoid the problem in the future, let's
flag retune in the reset handler directly whenever a card is present.

Reported-by: default avatarTakeshi Saito <takeshi.saito.xv@renesas.com>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20210316085717.7276-3-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 0a446288

drivers/mmc/host/tmio_mmc_core.c

+3 −2
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ static void tmio_mmc_reset(struct tmio_mmc_host *host) 
		sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask);

		sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001);

	}



	if (host->mmc->card)

		mmc_retune_needed(host->mmc);

}



static void tmio_mmc_reset_work(struct work_struct *work)
@@ -1290,8 +1293,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev) 


	tmio_mmc_enable_dma(host, true);



	mmc_retune_needed(host->mmc);



	return 0;

}

EXPORT_SYMBOL_GPL(tmio_mmc_host_runtime_resume);