---

yaml --- r: 297803 b: refs/heads/master c: 1a565cf h: refs/heads/master i: 297801: 8e94be1 297799: 4b8b1e4 v: v3
git-mirror · Jan 27, 2012 · e0863c9 · e0863c9
1 parent 509b324
commit e0863c9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bcfc723c8688a257df920999a43bcc2e59d5908
+refs/heads/master: 1a565cf07fa1be0a6d5cf30e87ee2d204e9753d3
diff --git a/trunk/arch/sh/kernel/cpufreq.c b/trunk/arch/sh/kernel/cpufreq.c
@@ -127,13 +127,19 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)
 
 	freq_table = cpuclk->nr_freqs ? cpuclk->freq_table : NULL;
 	if (freq_table) {
-		int result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
+		int result;
 
+		result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
 		if (!result)
 			cpufreq_frequency_table_get_attr(freq_table, cpu);
 	} else {
-		policy->cpuinfo.min_freq = (clk_round_rate(cpuclk, 1) + 500) / 1000;
-		policy->cpuinfo.max_freq = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
+		dev_notice(dev, "no frequency table found, falling back "
+			   "to rate rounding.\n");
+
+		policy->cpuinfo.min_freq =
+			(clk_round_rate(cpuclk, 1) + 500) / 1000;
+		policy->cpuinfo.max_freq =
+			(clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
 	}
 
 	policy->min = policy->cpuinfo.min_freq;