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: v3.16.35~2428 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0816dd8989d18760eb86a991e5476c1b651743dc;p=thirdparty%2Fkernel%2Fstable.git cpuidle: mvebu: Fix the CPU PM notifier usage commit 43b68879de27b1993518687fbc6013da80cdcbfe upstream. 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. Reported-by: Fulvio Benini Signed-off-by: Gregory CLEMENT Signed-off-by: Daniel Lezcano [ luis: backported to 3.16: - file rename: cpuidle-mvebu-v7.c -> cpuidle-armada-370-xp.c - adjusted context ] Signed-off-by: Luis Henriques --- diff --git a/drivers/cpuidle/cpuidle-armada-370-xp.c b/drivers/cpuidle/cpuidle-armada-370-xp.c index a5fba0287bfb4..1a428b478a0d3 100644 --- a/drivers/cpuidle/cpuidle-armada-370-xp.c +++ b/drivers/cpuidle/cpuidle-armada-370-xp.c @@ -38,11 +38,11 @@ static int armada_370_xp_enter_idle(struct cpuidle_device *dev, deepidle = true; ret = armada_370_xp_cpu_suspend(deepidle); + cpu_pm_exit(); + if (ret) return ret; - cpu_pm_exit(); - return index; }