From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 11 Feb 2016 21:19:10 +0000 (-0800)
Subject: clk: WARN_ON about to disable a critical clock
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2e20fbf592621b2c2aeddd82e0fa3dad053cce03;p=linux.git

clk: WARN_ON about to disable a critical clock

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/1455225554-13267-3-git-send-email-mturquette@baylibre.com
---

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 275201fd7b016..dede0ce679e47 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -574,6 +574,9 @@ static void clk_core_unprepare(struct clk_core *core)
 	if (WARN_ON(core->prepare_count == 0))
 		return;
 
+	if (WARN_ON(core->prepare_count == 1 && core->flags & CLK_IS_CRITICAL))
+		return;
+
 	if (--core->prepare_count > 0)
 		return;
 
@@ -679,6 +682,9 @@ static void clk_core_disable(struct clk_core *core)
 	if (WARN_ON(core->enable_count == 0))
 		return;
 
+	if (WARN_ON(core->enable_count == 1 && core->flags & CLK_IS_CRITICAL))
+		return;
+
 	if (--core->enable_count > 0)
 		return;