On 28/12/11 05:11, Aaron Lu wrote: > When suspending host, the tuning timer shoule be deactivated. > And the HOST_NEEDS_TUNING flag should be set after tuning timer is > deactivated. > > Signed-off-by: Philip Rakity <prakity@xxxxxxxxxxx> > Signed-off-by: Aaron Lu <aaron.lu@xxxxxxx> > Cc: stable@xxxxxxxxxx Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> > --- > drivers/mmc/host/sdhci.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index ab6018f..2007d37 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -2346,9 +2346,8 @@ int sdhci_suspend_host(struct sdhci_host *host) > /* Disable tuning since we are suspending */ > if (host->version >= SDHCI_SPEC_300 && host->tuning_count && > host->tuning_mode == SDHCI_TUNING_MODE_1) { > + del_timer_sync(&host->tuning_timer); > host->flags &= ~SDHCI_NEEDS_RETUNING; > - mod_timer(&host->tuning_timer, jiffies + > - host->tuning_count * HZ); > } > > ret = mmc_suspend_host(host->mmc); -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html