summaryrefslogtreecommitdiffstats
path: root/drivers/clk/clk.c
diff options
context:
space:
mode:
authorLee Jones2016-02-11 22:19:10 +0100
committerMichael Turquette2016-04-09 20:58:10 +0200
commit2e20fbf592621b2c2aeddd82e0fa3dad053cce03 (patch)
treec29456bb2133a5891c8318dde2d71a271580adb1 /drivers/clk/clk.c
parentclk: Allow clocks to be marked as CRITICAL (diff)
downloadkernel-qcow2-linux-2e20fbf592621b2c2aeddd82e0fa3dad053cce03.tar.gz
kernel-qcow2-linux-2e20fbf592621b2c2aeddd82e0fa3dad053cce03.tar.xz
kernel-qcow2-linux-2e20fbf592621b2c2aeddd82e0fa3dad053cce03.zip
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
Diffstat (limited to 'drivers/clk/clk.c')
-rw-r--r--drivers/clk/clk.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 275201fd7b01..dede0ce679e4 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;