From 76d5537de694eb0762cdbba6369335356a50c205 Mon Sep 17 00:00:00 2001 From: Steven Miao Date: Thu, 31 May 2012 18:29:08 +0800 Subject: [PATCH] --- yaml --- r: 313815 b: refs/heads/master c: 97929003c20b0d536bf4ac177f6134adffd33e82 h: refs/heads/master i: 313813: 5511f6c2769a4a8d30eeaf13589e4fa1fc2802d7 313811: dd4709fd191794c33a78aae5c53fa42393209c0b 313807: f380aed1737dea174c939fe9ab5d7e4b89fd8d61 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-bf609/clock.c | 3 ++- trunk/arch/blackfin/mach-common/cpufreq.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f519460794a8..e8f6bda20b66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 928a8e6933781ed99bb50a05e15a94cb24ab5c8d +refs/heads/master: 97929003c20b0d536bf4ac177f6134adffd33e82 diff --git a/trunk/arch/blackfin/mach-bf609/clock.c b/trunk/arch/blackfin/mach-bf609/clock.c index 7f8f529693ae..437d56c82281 100644 --- a/trunk/arch/blackfin/mach-bf609/clock.c +++ b/trunk/arch/blackfin/mach-bf609/clock.c @@ -97,9 +97,10 @@ int wait_for_pll_align(void) while (i-- && (bfin_read32(CGU0_STAT) & CGU0_STAT_CLKSALGN)); if (bfin_read32(CGU0_STAT) & CGU0_STAT_CLKSALGN) { - printk(KERN_DEBUG "fail to align clk\n"); + printk(KERN_CRIT "fail to align clk\n"); return -1; } + return 0; } diff --git a/trunk/arch/blackfin/mach-common/cpufreq.c b/trunk/arch/blackfin/mach-common/cpufreq.c index 6e87dc13f6bf..aee82a1a1ba4 100644 --- a/trunk/arch/blackfin/mach-common/cpufreq.c +++ b/trunk/arch/blackfin/mach-common/cpufreq.c @@ -173,7 +173,7 @@ static int bfin_target(struct cpufreq_policy *poli, #else ret = cpu_set_cclk(cpu, freqs.new * 1000); if (ret != 0) { - pr_debug("cpufreq set freq failed %d\n", ret); + WARN_ONCE(ret, "cpufreq set freq failed %d\n", ret); break; } #endif