]> git.baikalelectronics.ru Git - kernel.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)
commit7b80765c8011acc06e90a841a4963312afe93484
tree51274bccadd592591d4e3e0857047b5bd498517f
parent57972bb395c3c00f6301f502e045ce7bbcac7d49
ARM: OMAP1: Fix pm_idle during suspend

Commit 9ce5b3beda9f6f7c4b569fd14433646520a7f416 ([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