diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-12-19 09:11:11 -0800 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2012-01-20 18:55:05 -0500 |
| commit | 3c0b2cef913c8f92b15a5a1fe7b611836f7f80bf (patch) | |
| tree | 51274bccadd592591d4e3e0857047b5bd498517f /arch | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| download | linux-3.10-3c0b2cef913c8f92b15a5a1fe7b611836f7f80bf.tar.gz linux-3.10-3c0b2cef913c8f92b15a5a1fe7b611836f7f80bf.tar.bz2 linux-3.10-3c0b2cef913c8f92b15a5a1fe7b611836f7f80bf.zip | |
ARM: OMAP1: Fix pm_idle during suspend
Commit 9ccdac3662dbf3c75e8f8851a214bdf7d365a4bd ([ARM] idle:
clean up pm_idle calling, obey hlt_counter) removed a check
for NULL pm_idle.
Replace the NULL assignment in the OMAP1 code with disable_hlt()
to be in sync with the core code and restore the intended behavior.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap1/pm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 89ea20ca0cc..6c6a2dc554e 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -583,8 +583,6 @@ static void omap_pm_init_proc(void) #endif /* DEBUG && CONFIG_PROC_FS */ -static void (*saved_idle)(void) = NULL; - /* * omap_pm_prepare - Do preliminary suspend work. * @@ -592,8 +590,7 @@ static void (*saved_idle)(void) = NULL; static int omap_pm_prepare(void) { /* We cannot sleep in idle until we have resumed */ - saved_idle = pm_idle; - pm_idle = NULL; + disable_hlt(); return 0; } @@ -630,7 +627,7 @@ static int omap_pm_enter(suspend_state_t state) static void omap_pm_finish(void) { - pm_idle = saved_idle; + enable_hlt(); } |