summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-11-04 23:09:18 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2010-11-24 10:09:02 +0100
commit76586d35eb31192bf3f395c2e02cef8a57e3558c (patch)
treed75a6e6fe2d7b74de9634fcff8f16a57e41e84e2 /arch/arm/mach-imx
parent92fcdc9d1054a630f224657dc675e03bf3bb62ed (diff)
downloadlinux-76586d35eb31192bf3f395c2e02cef8a57e3558c.tar.gz
linux-76586d35eb31192bf3f395c2e02cef8a57e3558c.tar.bz2
linux-76586d35eb31192bf3f395c2e02cef8a57e3558c.zip
ARM i.MX27 pm: return gracefully on different socs
Code called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/pm-imx27.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/pm-imx27.c b/arch/arm/mach-imx/pm-imx27.c
index afc17ce0bb54..6bf81ceea137 100644
--- a/arch/arm/mach-imx/pm-imx27.c
+++ b/arch/arm/mach-imx/pm-imx27.c
@@ -39,6 +39,9 @@ static struct platform_suspend_ops mx27_suspend_ops = {
static int __init mx27_pm_init(void)
{
+ if (!cpu_is_mx27())
+ return 0;
+
suspend_set_ops(&mx27_suspend_ops);
return 0;
}