Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c0b2cef authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: OMAP1: Fix pm_idle during suspend 



Commit 9ccdac36 ([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: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
parent dcd6c922

arch/arm/mach-omap1/pm.c

+2 −5
Original line number Diff line number Diff line
@@ -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();

}