Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Derek Basehore <dbasehore@chromium.org>
To:     linux-kernel@vger.kernel.org
Cc:     bigeasy@linutronix.de, rafael.j.wysocki@intel.com,
        alex.shi@linaro.org, briannorris@chromium.org,
        marc.zyngier@arm.com, Derek Basehore <dbasehore@chromium.org>
Subject: [PATCH] cpu_pm: add syscore_suspend error handling
Date:   Wed, 28 Feb 2018 19:27:54 -0800
Message-Id: <20180301032754.146788-1-dbasehore@chromium.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

If cpu_cluster_pm_enter() fails, cpu_pm_exit() should be called. This
will put the CPU in the correct state to resume from the failure.

Signed-off-by: Derek Basehore <dbasehore@chromium.org>
---
 kernel/cpu_pm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/cpu_pm.c b/kernel/cpu_pm.c
index 67b02e138a47..03bcc0751a51 100644
--- a/kernel/cpu_pm.c
+++ b/kernel/cpu_pm.c
@@ -186,6 +186,9 @@ static int cpu_pm_suspend(void)
 		return ret;
 
 	ret = cpu_cluster_pm_enter();
+	if (ret)
+		cpu_pm_exit();
+
 	return ret;
 }
 
-- 
2.16.2.395.g2e18187dfd-goog