1 files changed, 8 insertions, 3 deletions

diff --git a/arch/arm/plat-samsung/clock-clksrc.c b/arch/arm/plat-samsung/clock-clksrc.c
index 33c633a8be8d..98c6b8859f49 100644
--- a/arch/arm/plat-samsung/clock-clksrc.c
+++ b/arch/arm/plat-samsung/clock-clksrc.c
@@ -129,11 +129,16 @@ void __init_or_cpufreq s3c_set_clksrc(struct clksrc_clk *clk, bool announce)
 {
         struct clksrc_sources *srcs = clk->sources;
         u32 mask = bit_mask(clk->reg_src.shift, clk->reg_src.size);
-        u32 clksrc = 0;
+        u32 clksrc;
 
-        if (clk->reg_src.reg)
-                clksrc = __raw_readl(clk->reg_src.reg);
+        if (!clk->reg_src.reg) {
+                if (!clk->clk.parent)
+                        printk(KERN_ERR "%s: no parent clock specified\n",
+                                clk->clk.name);
+                return;
+        }
 
+        clksrc = __raw_readl(clk->reg_src.reg);
         clksrc &= mask;
         clksrc >>= clk->reg_src.shift;