summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2015-12-12 10:07:31 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-01-10 23:13:17 +0100
commite00c5466cc726653fa07a6fd42b39759a5a45bd3 (patch)
tree5bc3af38d55b801b6c36e40312031edeb113198e
parent67220bff0c61aff103c826be6fe64efa8bfde513 (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)
-rw-r--r--arch/arm/kernel/reboot.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
index 1a4d232796be..798b1400c4cc 100644
--- a/arch/arm/kernel/reboot.c
+++ b/arch/arm/kernel/reboot.c
@@ -122,6 +122,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();
}
/*