summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/pm_bus.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-10 20:46:24 +0300
committerTony Lindgren <tony@atomide.com>2010-12-10 20:46:24 +0300
commit7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b (patch)
tree5077dcdafcf3281b94ef31eee399c35e7bfadf4b /arch/arm/mach-omap1/pm_bus.c
parentdf1e9d1c218ba696e376cad371b57c0109fe98c9 (diff)
downloadlinux-7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b.tar.xz
omap1: Add initcall checks for omap1 and booted board
Otherwise multi-omap1 configurations will fail. Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/pm_bus.c')
-rw-r--r--arch/arm/mach-omap1/pm_bus.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 8b66392be745..326644770ea8 100644
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -73,6 +73,9 @@ static int __init omap1_pm_runtime_init(void)
const struct dev_pm_ops *pm;
struct dev_pm_ops *omap_pm;
+ if (!cpu_class_is_omap1())
+ return -ENODEV;
+
pm = platform_bus_get_pm_ops();
if (!pm) {
pr_err("%s: unable to get dev_pm_ops from platform_bus\n",