From 1cb905ed025ab164ea7e8fc5704f2e9a415506dc Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 22 Jan 2009 16:08:04 +0000 Subject: [PATCH] --- yaml --- r: 137297 b: refs/heads/master c: dbb674d57b5851a4fe3122ff4280e4cf87209198 h: refs/heads/master i: 137295: 9a789a5c69ee455b9c9d36ff38555a42c8a40972 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/clock.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8baa65f64518..45e8784addc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e98ffa85e70f423e2e41156cc3d549c353cd897 +refs/heads/master: dbb674d57b5851a4fe3122ff4280e4cf87209198 diff --git a/trunk/arch/arm/plat-omap/clock.c b/trunk/arch/arm/plat-omap/clock.c index df58f5d9a5ab..6b3ef2a0b04e 100644 --- a/trunk/arch/arm/plat-omap/clock.c +++ b/trunk/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)