linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: anarsoul@gmail.com (Vasily Khoruzhick)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: PXA: Zipit Z2: Fix oops in z2_power_off
Date: Sun,  8 Jan 2012 11:33:36 +0300	[thread overview]
Message-ID: <1326011616-3546-1-git-send-email-anarsoul@gmail.com> (raw)

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

             reply	other threads:[~2012-01-08  8:33 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-08  8:33 Vasily Khoruzhick [this message]
2012-01-08  8:56 ` [PATCH] ARM: PXA: Zipit Z2: Fix oops in z2_power_off 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1326011616-3546-1-git-send-email-anarsoul@gmail.com \
    --to=anarsoul@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).