Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a8fa879 authored by Ritesh Harjani's avatar Ritesh Harjani Committed by Ulf Hansson
Browse files

mmc: sdhci: Clear SDHCI_HS400_TUNING flag after platform_execute_tuning 



Clear SDHCI_HS400_TUNING flag after platform_execute_tuning
so that platform_execute_tuning may use it if needed.

Signed-off-by: default avatarRitesh Harjani <riteshh@codeaurora.org>
Tested-by: default avatarJeremy McNicoll <jeremymc@redhat.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 083c9aa0

drivers/mmc/host/sdhci.c

+4 −2
Original line number Diff line number Diff line
@@ -2114,7 +2114,6 @@ int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) 
	spin_lock_irqsave(&host->lock, flags);



	hs400_tuning = host->flags & SDHCI_HS400_TUNING;

	host->flags &= ~SDHCI_HS400_TUNING;



	if (host->tuning_mode == SDHCI_TUNING_MODE_1)

		tuning_count = host->tuning_count;
@@ -2156,7 +2155,9 @@ int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) 


	if (host->ops->platform_execute_tuning) {

		spin_unlock_irqrestore(&host->lock, flags);

		return host->ops->platform_execute_tuning(host, opcode);

		err = host->ops->platform_execute_tuning(host, opcode);

		spin_lock_irqsave(&host->lock, flags);

		goto out_unlock;

	}



	host->mmc->retune_period = tuning_count;
@@ -2167,6 +2168,7 @@ int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) 


	sdhci_end_tuning(host);

out_unlock:

	host->flags &= ~SDHCI_HS400_TUNING;

	spin_unlock_irqrestore(&host->lock, flags);



	return err;