diff options
| author | Sang-Hun Lee <sanlee@nvidia.com> | 2012-04-16 10:55:33 -0700 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-04-19 07:42:13 -0700 |
| commit | 2ef69e26274348c6d4ab744f86b9cf76f9bfa8d8 (patch) | |
| tree | aaa300354285d8a88bc3b3dfdbd5fe2033582c0d | |
| parent | 4e1769f2438a00e67f71c887ce0f50efbcb9fc41 (diff) | |
Revert "ARM: pm: force non-zero return value from __cpu_suspend when aborting"
This reverts commit 037bc840859c0d52abedeb576888714698f04bcf.
Bug 967887
Signed-off-by: Sang-Hun Lee <sanlee@nvidia.com>
Change-Id: I89fa9aad8e56628ebb8932c694d37ab92daaab22
Reviewed-on: http://git-master/r/96796
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
| -rw-r--r-- | arch/arm/kernel/sleep.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index a723e6b16bf5..e87f5f243012 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -61,8 +61,6 @@ 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) |