From: Gregory CLEMENT Date: Thu, 26 Feb 2015 17:20:48 +0000 (+0100) Subject: cpuidle: mvebu: Fix the CPU PM notifier usage X-Git-Tag: v4.0-rc5~8^2~1^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43b68879de27b1993518687fbc6013da80cdcbfe;p=platform%2Fkernel%2Flinux-exynos.git cpuidle: mvebu: Fix the CPU PM notifier usage As stated in kernel/cpu_pm.c, "Platform is responsible for ensuring that cpu_pm_enter is not called twice on the same CPU before cpu_pm_exit is called.". In the current code in case of failure when calling mvebu_v7_cpu_suspend, the function cpu_pm_exit() is never called whereas cpu_pm_enter() was called just before. This patch moves the cpu_pm_exit() in order to balance the cpu_pm_enter() calls. Cc: stable@vger.kernel.org Reported-by: Fulvio Benini Signed-off-by: Gregory CLEMENT Signed-off-by: Daniel Lezcano --- diff --git a/drivers/cpuidle/cpuidle-mvebu-v7.c b/drivers/cpuidle/cpuidle-mvebu-v7.c index 38e6861..cefa074 100644 --- a/drivers/cpuidle/cpuidle-mvebu-v7.c +++ b/drivers/cpuidle/cpuidle-mvebu-v7.c @@ -37,11 +37,11 @@ static int mvebu_v7_enter_idle(struct cpuidle_device *dev, deepidle = true; ret = mvebu_v7_cpu_suspend(deepidle); + cpu_pm_exit(); + if (ret) return ret; - cpu_pm_exit(); - return index; }