* [PATCH] mmc: sdhci: deactivate tuning timer when host is suspending
@ 2011-12-27 4:22 Aaron Lu
2012-01-03 0:02 ` Chris Ball
0 siblings, 1 reply; 4+ messages in thread
From: Aaron Lu @ 2011-12-27 4:22 UTC (permalink / raw)
To: 'Chris Ball'; +Cc: stable, linux-mmc, Aaron Lu, Philip Rakity
From: Philip Rakity <prakity@marvell.com>
Since we are suspending, the tuning timer should be deactivated.
Signed-off-by: Philip Rakity <prakity@marvell.com>
Acked-by: Aaron Lu <aaron.lu@amd.com>
---
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);
--
1.7.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] mmc: sdhci: deactivate tuning timer when host is suspending
2011-12-27 4:22 [PATCH] mmc: sdhci: deactivate tuning timer when host is suspending Aaron Lu
@ 2012-01-03 0:02 ` Chris Ball
2012-01-04 1:14 ` Aaron Lu
0 siblings, 1 reply; 4+ messages in thread
From: Chris Ball @ 2012-01-03 0:02 UTC (permalink / raw)
To: Aaron Lu; +Cc: linux-mmc, Philip Rakity
Hi,
On Mon, Dec 26 2011, Aaron Lu wrote:
> From: Philip Rakity <prakity@marvell.com>
>
> Since we are suspending, the tuning timer should be deactivated.
>
> Signed-off-by: Philip Rakity <prakity@marvell.com>
> Acked-by: Aaron Lu <aaron.lu@amd.com>
> ---
> 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.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mmc: sdhci: deactivate tuning timer when host is suspending
2012-01-03 0:02 ` Chris Ball
@ 2012-01-04 1:14 ` Aaron Lu
2012-01-04 1:24 ` Chris Ball
0 siblings, 1 reply; 4+ messages in thread
From: Aaron Lu @ 2012-01-04 1:14 UTC (permalink / raw)
To: Chris Ball; +Cc: linux-mmc, Philip Rakity
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 <prakity@marvell.com>
> >
> > Since we are suspending, the tuning timer should be deactivated.
> >
> > Signed-off-by: Philip Rakity <prakity@marvell.com>
> > Acked-by: Aaron Lu <aaron.lu@amd.com>
> > ---
> > 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 <cjb@laptop.org> <http://printf.net/>
> One Laptop Per Child
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mmc: sdhci: deactivate tuning timer when host is suspending
2012-01-04 1:14 ` Aaron Lu
@ 2012-01-04 1:24 ` Chris Ball
0 siblings, 0 replies; 4+ messages in thread
From: Chris Ball @ 2012-01-04 1:24 UTC (permalink / raw)
To: Aaron Lu; +Cc: linux-mmc, Philip Rakity
Hi,
On Tue, Jan 03 2012, Aaron Lu wrote:
> 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
Okay -- I've pushed that one instead, thanks.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-01-04 1:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-27 4:22 [PATCH] mmc: sdhci: deactivate tuning timer when host is suspending Aaron Lu
2012-01-03 0:02 ` Chris Ball
2012-01-04 1:14 ` Aaron Lu
2012-01-04 1:24 ` Chris Ball
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox