]> git.karo-electronics.de Git - mv-sheeva.git/commit
ARM: OMAP1: Fix pm_idle during suspend
authorNicolas Pitre <nicolas.pitre@linaro.org>
Mon, 19 Dec 2011 17:11:11 +0000 (09:11 -0800)
committerNicolas Pitre <nico@fluxnic.net>
Fri, 20 Jan 2012 23:55:05 +0000 (18:55 -0500)
commit3c0b2cef913c8f92b15a5a1fe7b611836f7f80bf
tree51274bccadd592591d4e3e0857047b5bd498517f
parentdcd6c92267155e70a94b3927bce681ce74b80d1f
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>
arch/arm/mach-omap1/pm.c