diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-12-12 10:07:31 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-21 14:27:31 +0100 |
| commit | 679683bf2fc93da064835520f56bef6a3998779c (patch) | |
| tree | e1edd12ac2438ddce5590c018d29a500a519246d /arch/arm | |
| parent | d4e8e84c02d248d8e3bd5df028a124fd2e0de08e (diff) | |
process.c: if power off fails, do at least a halt
Otherwise power_machine_power_off() returns and e.g. unexpected interrupts
create stack traces.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 8d35764ee16976d81ac7dd0b75b3c0b11f977ad1)
(cherry picked from commit e00c5466cc726653fa07a6fd42b39759a5a45bd3)
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/reboot.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c index 3fa867a2aae6..d160288ef2fc 100644 --- a/arch/arm/kernel/reboot.c +++ b/arch/arm/kernel/reboot.c @@ -120,6 +120,9 @@ void machine_power_off(void) if (pm_power_off) pm_power_off(); + /* shoud pm_power_off not exist of fail, then at least do a halt*/ + pr_err("%s pm_power_off() did return\n",__func__); + machine_halt(); } /* |