diff options
author | Marc Gonzalez <marc.w.gonzalez@free.fr> | 2019-01-16 16:49:58 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2019-01-30 11:45:10 +0100 |
commit | d0f9f16788e15d9eb40f68b047732d49658c5a3a (patch) | |
tree | 5523851b802c419eb38cc59116ef9e97b6bbfc8f /arch/arm/mach-tango/pm.c | |
parent | a17bab2d6784630a8ef50f872db7a68b43392f82 (diff) |
ARM: tango: Improve ARCH_MULTIPLATFORM compatibility
Calling platform-specific code unconditionally blows up when running
an ARCH_MULTIPLATFORM kernel on a different platform. Don't do it.
Reported-by: Paolo Pisati <p.pisati@gmail.com>
Signed-off-by: Marc Gonzalez <marc.w.gonzalez@free.fr>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: stable@vger.kernel.org # v4.8+
Fixes: a30eceb7a59d ("ARM: tango: add Suspend-to-RAM support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tango/pm.c')
-rw-r--r-- | arch/arm/mach-tango/pm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-tango/pm.c b/arch/arm/mach-tango/pm.c index 028e50c6383f..a32c3b631484 100644 --- a/arch/arm/mach-tango/pm.c +++ b/arch/arm/mach-tango/pm.c @@ -3,6 +3,7 @@ #include <linux/suspend.h> #include <asm/suspend.h> #include "smc.h" +#include "pm.h" static int tango_pm_powerdown(unsigned long arg) { @@ -24,10 +25,7 @@ static const struct platform_suspend_ops tango_pm_ops = { .valid = suspend_valid_only_mem, }; -static int __init tango_pm_init(void) +void __init tango_pm_init(void) { suspend_set_ops(&tango_pm_ops); - return 0; } - -late_initcall(tango_pm_init); |