Skip to content

Commit

Permalink
cpuidle: mvebu: Fix the CPU PM notifier usage
Browse files Browse the repository at this point in the history
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 <fbf@libero.it>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
  • Loading branch information
Gregory CLEMENT authored and Daniel Lezcano committed Mar 13, 2015
1 parent 9eccca0 commit 43b6887
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/cpuidle/cpuidle-mvebu-v7.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 43b6887

Please sign in to comment.