Merge "clk: fix critical clock locking"

drivers/clk/clk.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -3128,8 +3128,13 @@ static int __clk_init(struct device dev, struct clk clk_user)
		core->ops->init(core->hw);

		if (core->flags & CLK_IS_CRITICAL) {
		unsigned long flags;

		clk_core_prepare(core);

		flags = clk_enable_lock();
		clk_core_enable(core);
		clk_enable_unlock(flags);
		}

		kref_init(&core->ref);