Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756030AbbDUQPl (ORCPT ); Tue, 21 Apr 2015 12:15:41 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:57312 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755908AbbDUPdc (ORCPT ); Tue, 21 Apr 2015 11:33:32 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Gregory CLEMENT , Daniel Lezcano , Luis Henriques Subject: [PATCH 3.16.y-ckt 051/144] cpuidle: mvebu: Fix the CPU PM notifier usage Date: Tue, 21 Apr 2015 16:30:36 +0100 Message-Id: <1429630329-21748-52-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429630329-21748-1-git-send-email-luis.henriques@canonical.com> References: <1429630329-21748-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1785 Lines: 51 3.16.7-ckt10 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Gregory CLEMENT 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 --- drivers/cpuidle/cpuidle-armada-370-xp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/