From: Sven Neumann <s.neumann@raumfeld.com>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Eric Miao <eric.y.miao@gmail.com>,
Daniel Mack <daniel@caiaq.de>,
Sven Neumann <s.neumann@raumfeld.com>
Subject: [PATCH] ARM: pxa: fix suspend on PXA3XX
Date: Mon, 24 Jan 2011 11:15:52 +0100 [thread overview]
Message-ID: <1295864152-773-1-git-send-email-s.neumann@raumfeld.com> (raw)
In-Reply-To: <20110124095138.GC16202@n2100.arm.linux.org.uk>
Resurrect the save and restore functions in pxa3xx_cpu_pm_fns
so that pxa_pm_enter() won't crash. This fixes a regression
introduced by commit aae8224d.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
arch/arm/mach-pxa/pxa3xx.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index fed372e..9320a12 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -205,7 +205,17 @@ static int pxa3xx_cpu_pm_valid(suspend_state_t state)
return state == PM_SUSPEND_MEM || state == PM_SUSPEND_STANDBY;
}
+static void pxa3xx_cpu_pm_save(unsigned long *sleep_save)
+{
+}
+
+static void pxa3xx_cpu_pm_restore(unsigned long *sleep_save)
+{
+}
+
static struct pxa_cpu_pm_fns pxa3xx_cpu_pm_fns = {
+ .save = pxa3xx_cpu_pm_save,
+ .restore = pxa3xx_cpu_pm_restore,
.valid = pxa3xx_cpu_pm_valid,
.enter = pxa3xx_cpu_pm_enter,
};
--
1.7.1
next prev parent reply other threads:[~2011-01-24 10:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-24 9:29 kernel NULL pointer dereference in pxa_pm_enter (2.6.38-rc2) Sven Neumann
2011-01-24 9:51 ` Russell King - ARM Linux
2011-01-24 10:15 ` Sven Neumann [this message]
2011-01-24 10:17 ` [PATCH] ARM: pxa: fix suspend on PXA3XX Russell King - ARM Linux
2011-01-24 10:25 ` Sven Neumann
2011-01-25 21:06 ` Eric Miao
2011-01-26 8:10 ` Sven Neumann
2011-01-27 14:46 ` Eric Miao
2011-01-31 12:36 ` Marek Vasut
2011-01-31 13:29 ` Sven Neumann
2011-01-24 10:21 ` Sven Neumann
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=1295864152-773-1-git-send-email-s.neumann@raumfeld.com \
--to=s.neumann@raumfeld.com \
--cc=daniel@caiaq.de \
--cc=eric.y.miao@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
/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
all inboxes | Powered by JetHome®