summaryrefslogtreecommitdiff
path: root/drivers/cpuidle
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-05-12 12:20:40 +0800
committerAlex Shi <alex.shi@linaro.org>2016-05-12 12:20:40 +0800
commitb3f09bff3f6f291d4ef5d400426278856bf24c27 (patch)
treed9b01ee6f510b32aacbed3487634218ece3fbfe2 /drivers/cpuidle
parent334ca3ed18ded942e0220719f70b80eb20fa48ec (diff)
parente37ddf27108a992e191b27df9bd532cb9157dc89 (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/cpuidle')
-rw-r--r--drivers/cpuidle/cpuidle-arm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c
index 545069d5fdfb..e342565e8715 100644
--- a/drivers/cpuidle/cpuidle-arm.c
+++ b/drivers/cpuidle/cpuidle-arm.c
@@ -50,7 +50,7 @@ static int arm_enter_idle_state(struct cpuidle_device *dev,
* call the CPU ops suspend protocol with idle index as a
* parameter.
*/
- arm_cpuidle_suspend(idx);
+ ret = arm_cpuidle_suspend(idx);
cpu_pm_exit();
}