From b5cbdb8a5250940d033a4585f6902029d76d6993 Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Thu, 9 Sep 2010 19:58:23 +0200
Subject: [PATCH] --- yaml --- r: 210504 b: refs/heads/master c:
 5afddee415c829704d3a91031ae634008bc332e9 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-at91/clock.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c6d9f3a89230..ed2069167d79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d2602e0778299e2d6084f03086b716d6e7a1e1e
+refs/heads/master: 5afddee415c829704d3a91031ae634008bc332e9
diff --git a/trunk/arch/arm/mach-at91/clock.c b/trunk/arch/arm/mach-at91/clock.c
index 7f7da439341f..7525cee3983f 100644
--- a/trunk/arch/arm/mach-at91/clock.c
+++ b/trunk/arch/arm/mach-at91/clock.c
@@ -501,7 +501,8 @@ postcore_initcall(at91_clk_debugfs_init);
 int __init clk_register(struct clk *clk)
 {
 	if (clk_is_peripheral(clk)) {
-		clk->parent = &mck;
+		if (!clk->parent)
+			clk->parent = &mck;
 		clk->mode = pmc_periph_mode;
 		list_add_tail(&clk->node, &clocks);
 	}