From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 27 Aug 2011 10:17:36 +0000 (+0100)
Subject: ARM: pm: force non-zero return value from __cpu_suspend when aborting
X-Git-Tag: MMI-PSA29.97-13-9~18195^2~5^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f5fa68d9674156ddaafa12a058ccc93c8866d5f9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ARM: pm: force non-zero return value from __cpu_suspend when aborting

Ensure that the return value from __cpu_suspend is non-zero when
aborting.  Zero indicates a successful suspend occurred.

Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S
index dc902f2c6845..46a9f460db83 100644
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@ -61,6 +61,8 @@ ENDPROC(__cpu_suspend)
 
 cpu_suspend_abort:
 	ldmia	sp!, {r1 - r3}		@ pop v:p, virt SP, phys resume fn
+	teq	r0, #0
+	moveq	r0, #1			@ force non-zero value
 	mov	sp, r2
 	ldmfd	sp!, {r4 - r11, pc}
 ENDPROC(cpu_suspend_abort)