Merge "clk: Fix handoff counts for parent of handoff enabled clocks"

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index ac815c6dbac0..6493b59dac01 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -188,6 +188,9 @@ static bool clk_core_is_enabled(struct clk_core *core)
 	return core->ops->is_enabled(core->hw);
 }
 
+static void clk_core_unprepare(struct clk_core *core);
+static void clk_core_disable(struct clk_core *core);
+
 static void clk_unprepare_unused_subtree(struct clk_core *core)
 {
 	struct clk_core *child;
@@ -207,7 +210,7 @@ static void clk_unprepare_unused_subtree(struct clk_core *core)
 	 */
 	if (core->need_handoff_prepare) {
 		core->need_handoff_prepare = false;
-		core->prepare_count--;
+		clk_core_unprepare(core);
 	}
 
 	if (core->prepare_count)
@@ -246,7 +249,9 @@ static void clk_disable_unused_subtree(struct clk_core *core)
 	 */
 	if (core->need_handoff_enable) {
 		core->need_handoff_enable = false;
-		core->enable_count--;
+		flags = clk_enable_lock();
+		clk_core_disable(core);
+		clk_enable_unlock(flags);
 	}
 
 	flags = clk_enable_lock();