Merge "clk: fix critical clock locking"

This commit is contained in:
Linux Build Service Account 2016-11-29 07:44:05 -08:00 committed by Gerrit - the friendly Code Review server
commit a95f91f51a

View file

@ -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);