diff --git a/[refs] b/[refs]
index 36434215677c..0375fdd8db80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b458858f6d40650513f63feef0b350eff4845f
+refs/heads/master: cec444b79073e7d6ef35ced5ef63c3fd83d9b9a7
diff --git a/trunk/arch/arm/plat-s3c/clock.c b/trunk/arch/arm/plat-s3c/clock.c
index 35249b58f383..da7ac07c7a0b 100644
--- a/trunk/arch/arm/plat-s3c/clock.c
+++ b/trunk/arch/arm/plat-s3c/clock.c
@@ -304,6 +304,9 @@ int s3c24xx_register_clock(struct clk *clk)
 
 	/* add to the list of available clocks */
 
+	/* Quick check to see if this clock has already been registered. */
+	BUG_ON(clk->list.prev != clk->list.next);
+
 	spin_lock(&clocks_lock);
 	list_add(&clk->list, &clocks);
 	spin_unlock(&clocks_lock);