From 73b558b453f60ca493376bc97be10444122e5050 Mon Sep 17 00:00:00 2001 From: Thomas Abraham Date: Mon, 18 Jan 2010 14:30:16 +0900 Subject: [PATCH] --- yaml --- r: 187385 b: refs/heads/master c: b8792dbff6ed93c5a77f71917d4a0c5efa12eee1 h: refs/heads/master i: 187383: 58b3785ee6b46b8ac7a3721f91df5a8d4899ddc3 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-samsung/clock-clksrc.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ab8ec191f3af..b2ea0a59f5e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0de298a0eee7f9004a8e512c12c7b40d66c9934 +refs/heads/master: b8792dbff6ed93c5a77f71917d4a0c5efa12eee1 diff --git a/trunk/arch/arm/plat-samsung/clock-clksrc.c b/trunk/arch/arm/plat-samsung/clock-clksrc.c index 33c633a8be8d..98c6b8859f49 100644 --- a/trunk/arch/arm/plat-samsung/clock-clksrc.c +++ b/trunk/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;