diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-27 06:17:36 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-20 18:33:28 -0400 |
| commit | f5fa68d9674156ddaafa12a058ccc93c8866d5f9 (patch) | |
| tree | 51d3a321a18512c05491d321911f754d8b5cd2f8 /arch/arm | |
| parent | 25904157168ddc8841748a729914f00e53d7e049 (diff) | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/sleep.S | 2 |
1 files changed, 2 insertions, 0 deletions
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) | |||
| 61 | 61 | ||
| 62 | cpu_suspend_abort: | 62 | cpu_suspend_abort: |
| 63 | ldmia sp!, {r1 - r3} @ pop v:p, virt SP, phys resume fn | 63 | ldmia sp!, {r1 - r3} @ pop v:p, virt SP, phys resume fn |
| 64 | teq r0, #0 | ||
| 65 | moveq r0, #1 @ force non-zero value | ||
| 64 | mov sp, r2 | 66 | mov sp, r2 |
| 65 | ldmfd sp!, {r4 - r11, pc} | 67 | ldmfd sp!, {r4 - r11, pc} |
| 66 | ENDPROC(cpu_suspend_abort) | 68 | ENDPROC(cpu_suspend_abort) |