Commit b3cacf31 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt

sh: call clock framework init() callback once

Make sure that clk->ops->init() only gets called once in
the case of CLK_ALWAYS_ENABLED. Without this patch the
init() callback may be called multiple times.
Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 5dafc91f
...@@ -99,15 +99,18 @@ static int __clk_enable(struct clk *clk) ...@@ -99,15 +99,18 @@ static int __clk_enable(struct clk *clk)
* changes and the clock needs to hunt for the proper set of * changes and the clock needs to hunt for the proper set of
* divisors to use before it can effectively recalc. * divisors to use before it can effectively recalc.
*/ */
if (clk->flags & CLK_ALWAYS_ENABLED) {
kref_get(&clk->kref);
return 0;
}
if (unlikely(atomic_read(&clk->kref.refcount) == 1)) if (unlikely(atomic_read(&clk->kref.refcount) == 1))
if (clk->ops && clk->ops->init) if (clk->ops && clk->ops->init)
clk->ops->init(clk); clk->ops->init(clk);
kref_get(&clk->kref); kref_get(&clk->kref);
if (clk->flags & CLK_ALWAYS_ENABLED)
return 0;
if (likely(clk->ops && clk->ops->enable)) if (likely(clk->ops && clk->ops->enable))
clk->ops->enable(clk); clk->ops->enable(clk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment