| Message ID | 1427720471-24890-1-git-send-email-luis.henriques@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/drivers/cpuidle/cpuidle-armada-370-xp.c b/drivers/cpuidle/cpuidle-armada-370-xp.c index a5fba0287bfb..1a428b478a0d 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; }
This is a note to let you know that I have just added a patch titled cpuidle: mvebu: Fix the CPU PM notifier usage to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.16.y-queue This patch is scheduled to be released in version 3.16.7-ckt10. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.16.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Luis ------ From 0816dd8989d18760eb86a991e5476c1b651743dc Mon Sep 17 00:00:00 2001 From: Gregory CLEMENT <gregory.clement@free-electrons.com> Date: Thu, 26 Feb 2015 18:20:48 +0100 Subject: 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 <fbf@libero.it> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> [ luis: backported to 3.16: - file rename: cpuidle-mvebu-v7.c -> cpuidle-armada-370-xp.c - adjusted context ] Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- drivers/cpuidle/cpuidle-armada-370-xp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)