linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: PXA: Zipit Z2: Fix oops in z2_power_off
@ 2012-01-08  8:33 Vasily Khoruzhick
  2012-01-08  8:56 ` Marek Vasut
  0 siblings, 1 reply; 14+ messages in thread
From: Vasily Khoruzhick @ 2012-01-08  8:33 UTC (permalink / raw)
  To: linux-arm-kernel

pxa27x_set_pwrmode is marked with __init, so it's not legitimate
to call it in pm_power_off hook.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
 arch/arm/mach-pxa/z2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index 0fb5617..8b0ce77 100644
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -33,6 +33,7 @@
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/suspend.h>
 
 #include <mach/pxa27x.h>
 #include <mach/mfp-pxa27x.h>
@@ -739,8 +740,7 @@ static void z2_power_off(void)
 	 */
 	PSPR = 0x0;
 	local_irq_disable();
-	pxa27x_set_pwrmode(PWRMODE_DEEPSLEEP);
-	pxa27x_cpu_pm_enter(PM_SUSPEND_MEM);
+	cpu_suspend(PWRMODE_DEEPSLEEP, pxa27x_finish_suspend);
 }
 #else
 #define z2_power_off   NULL
-- 
1.7.8.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2012-01-09 17:50 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-08  8:33 [PATCH] ARM: PXA: Zipit Z2: Fix oops in z2_power_off Vasily Khoruzhick
2012-01-08  8:56 ` Marek Vasut
2012-01-08  9:51   ` Vasily Khoruzhick
2012-01-08 10:40     ` Marek Vasut
2012-01-08 11:37       ` Russell King - ARM Linux
2012-01-08 21:40       ` Vasily Khoruzhick
2012-01-08 23:58         ` Marek Vasut
2012-01-09  8:51           ` Vasily Khoruzhick
2012-01-09 12:13             ` Marek Vasut
2012-01-09 12:17               ` Russell King - ARM Linux
2012-01-09 12:38                 ` Marek Vasut
2012-01-09 13:21                   ` Russell King - ARM Linux
2012-01-09 16:25                     ` Marek Vasut
2012-01-09 17:50                       ` Russell King - ARM Linux

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).