---

yaml --- r: 210504 b: refs/heads/master c: 5afddee h: refs/heads/master v: v3
git-mirror · Sep 9, 2010 · b5cbdb8 · b5cbdb8
1 parent 4374eba
commit b5cbdb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 	}