Commit dbb674d5 authored by Russell King's avatar Russell King Committed by Russell King

[ARM] omap: allow double-registering of clocks

This stops things blowing up if a 'struct clk' to be passed more
than once to clk_register(), which will be required when we decouple
struct clk's from their names.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1e98ffa8
...@@ -292,6 +292,12 @@ int clk_register(struct clk *clk) ...@@ -292,6 +292,12 @@ int clk_register(struct clk *clk)
if (clk == NULL || IS_ERR(clk)) if (clk == NULL || IS_ERR(clk))
return -EINVAL; return -EINVAL;
/*
* trap out already registered clocks
*/
if (clk->node.next || clk->node.prev)
return 0;
mutex_lock(&clocks_mutex); mutex_lock(&clocks_mutex);
list_add(&clk->node, &clocks); list_add(&clk->node, &clocks);
if (clk->init) if (clk->init)
......
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