Skip to content

Commit

Permalink
mmc: sdhci: Clear SDHCI_HS400_TUNING flag after platform_execute_tuning
Browse files Browse the repository at this point in the history 
Clear SDHCI_HS400_TUNING flag after platform_execute_tuning
so that platform_execute_tuning may use it if needed.

Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
Tested-by: Jeremy McNicoll <jeremymc@redhat.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
Ritesh Harjani authored and Ulf Hansson committed Feb 13, 2017
1 parent 083c9aa commit 8a8fa87
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/mmc/host/sdhci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 8a8fa87

Please sign in to comment.