On Mon, Jan 02, 2012 at 07:02:27PM -0500, Chris Ball wrote: > Hi, > > On Mon, Dec 26 2011, Aaron Lu wrote: > > From: Philip Rakity <[email protected]> > > > > Since we are suspending, the tuning timer should be deactivated. > > > > Signed-off-by: Philip Rakity <[email protected]> > > Acked-by: Aaron Lu <[email protected]> > > --- > > 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..1abbd26 100644 > > --- a/drivers/mmc/host/sdhci.c > > +++ b/drivers/mmc/host/sdhci.c > > @@ -2347,8 +2347,7 @@ int sdhci_suspend_host(struct sdhci_host *host) > > if (host->version >= SDHCI_SPEC_300 && host->tuning_count && > > host->tuning_mode == SDHCI_TUNING_MODE_1) { > > host->flags &= ~SDHCI_NEEDS_RETUNING; > > - mod_timer(&host->tuning_timer, jiffies + > > - host->tuning_count * HZ); > > + del_timer_sync(&host->tuning_timer); > > } > > > > ret = mmc_suspend_host(host->mmc); > > Pushed to mmc-next for 3.3 with a stable@ tag, thanks.
I'm sorry Chris, this patch is deprecated and please apply the following patch with Adrian's ack instead: [PATCH 1/2] mmc: sdhci: Fix tuning timer incorrect setting when suspending host Thanks. > > - Chris. > -- > Chris Ball <[email protected]> <http://printf.net/> > One Laptop Per Child > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
