From: Adrian Hunter Date: Fri, 2 Dec 2016 13:14:21 +0000 (+0200) Subject: mmc: sdhci: Fix tuning reset after exhausting the maximum number of loops X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5ef5203b95c5090ba40e30ee8eedc5a937fc2898;p=linux.git mmc: sdhci: Fix tuning reset after exhausting the maximum number of loops If the driver has exhausted the maximum number of tuning loops, then fixed sampling is used. To do that both SDHCI_CTRL_TUNED_CLK and SDHCI_CTRL_EXEC_TUNING must be reset to 0, but only SDHCI_CTRL_TUNED_CLK was being reset. Reset SDHCI_CTRL_EXEC_TUNING to 0 also. Signed-off-by: Adrian Hunter Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 1d72a51287d4b..ad2f2c6113e4e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2134,6 +2134,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) */ if (tuning_loop_counter < 0) { ctrl &= ~SDHCI_CTRL_TUNED_CLK; + ctrl &= ~SDHCI_CTRL_EXEC_TUNING; sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); } if (!(ctrl & SDHCI_CTRL_TUNED_CLK)) {