X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=arch%2Farm%2Fmach-at91%2Fclock.c;h=7525cee3983f7252fac0542be5955a490ca6869b;hb=5afddee415c829704d3a91031ae634008bc332e9;hp=7f7da439341fabc4e85b6febeb8b1f3e2cd6f4ee;hpb=8d2602e0778299e2d6084f03086b716d6e7a1e1e;p=net-next-2.6.git

diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 7f7da439341..7525cee3983 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/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);
 	}