diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-22 16:08:04 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 17:50:12 +0000 |
| commit | dbb674d57b5851a4fe3122ff4280e4cf87209198 (patch) | |
| tree | 9cb4c4fba2c6ce395308dc696a06082f2ea5183a /arch/arm | |
| parent | 1e98ffa85e70f423e2e41156cc3d549c353cd897 (diff) | |
| download | linux-dbb674d57b5851a4fe3122ff4280e4cf87209198.tar.bz2 | |
[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: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-omap/clock.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index df58f5d9a5ab..6b3ef2a0b04e 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c @@ -292,6 +292,12 @@ int clk_register(struct clk *clk) if (clk == NULL || IS_ERR(clk)) return -EINVAL; + /* + * trap out already registered clocks + */ + if (clk->node.next || clk->node.prev) + return 0; + mutex_lock(&clocks_mutex); list_add(&clk->node, &clocks); if (clk->init) |