Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 071a0cb6 authored by Michael Turquette's avatar Michael Turquette
Browse files

Merge commit 'f17a0dd1' into clk-next

parents 72ad679a f17a0dd1

drivers/clk/clk.c

+4 −4
Original line number Diff line number Diff line
@@ -688,12 +688,12 @@ static void clk_core_disable(struct clk_core *core) 
	if (--core->enable_count > 0)

		return;



	trace_clk_disable(core);

	trace_clk_disable_rcuidle(core);



	if (core->ops->disable)

		core->ops->disable(core->hw);



	trace_clk_disable_complete(core);

	trace_clk_disable_complete_rcuidle(core);



	clk_core_disable(core->parent);

}
@@ -741,12 +741,12 @@ static int clk_core_enable(struct clk_core *core) 
		if (ret)

			return ret;



		trace_clk_enable(core);

		trace_clk_enable_rcuidle(core);



		if (core->ops->enable)

			ret = core->ops->enable(core->hw);



		trace_clk_enable_complete(core);

		trace_clk_enable_complete_rcuidle(core);



		if (ret) {

			clk_core_disable(core->parent);