Commit f5fa68d9 authored Aug 27, 2011 by Russell King

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>

parent 25904157

arch/arm/kernel/sleep.S

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -61,6 +61,8 @@ ENDPROC(__cpu_suspend)

	cpu_suspend_abort:		cpu_suspend_abort:
	ldmia sp!, {r1 - r3} @ pop v:p, virt SP, phys resume fn		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		mov sp, r2
	ldmfd sp!, {r4 - r11, pc}		ldmfd sp!, {r4 - r11, pc}
	ENDPROC(cpu_suspend_abort)		ENDPROC(cpu_suspend_abort)