On Thu, Mar 7, 2013 at 11:01 AM, Shaik Ameer Basha <shaik.ameer@xxxxxxxxxxx> wrote: > s3c_set_clksrc() updates the clock source as per u-boot settings. > This patch adds the functionality to overwrite u-boot settings, > if user provides the clock parent field. In case of wrong source > provided by the user, it will retain the u-boot settings. > > Signed-off-by: Shaik Ameer Basha <shaik.ameer@xxxxxxxxxxx> > --- > arch/arm/plat-samsung/clock-clksrc.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/plat-samsung/clock-clksrc.c b/arch/arm/plat-samsung/clock-clksrc.c > index 786a410..4fecd80 100644 > --- a/arch/arm/plat-samsung/clock-clksrc.c > +++ b/arch/arm/plat-samsung/clock-clksrc.c > @@ -150,7 +150,12 @@ void __init_or_cpufreq s3c_set_clksrc(struct clksrc_clk *clk, bool announce) > return; > } > > - clk->clk.parent = srcs->sources[clksrc]; > + if (clk->clk.parent) { > + if (s3c_setparent_clksrc(&clk->clk, clk->clk.parent)) > + clk->clk.parent = srcs->sources[clksrc]; IMO, it make sense to return the error value if failed. Now you are masking the failed cases (due to invalid parent clk) and proceeding with uboot values which is not the intention when parent clock is provided. Regards, Rahul Sharma, > + } else { > + clk->clk.parent = srcs->sources[clksrc]; > + } > > if (announce) > printk(KERN_INFO "%s: source is %s (%d), rate is %ld\n", > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html