Merge branch 'pm-cpufreq'

[sfrench/cifs-2.6.git] / drivers / cpufreq / s5pv210-cpufreq.c

diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index e5cb17d4be7b905d50192dda0245fbb7f2addb28..5d10030f2560218e0b1d381fca19817459165b2d 100644 (file)
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -541,7 +541,8 @@ static int s5pv210_cpu_init(struct cpufreq_policy *policy)
        s5pv210_dram_conf[1].freq = clk_get_rate(dmc1_clk);
 
        policy->suspend_freq = SLEEP_FREQ;
-       return cpufreq_generic_init(policy, s5pv210_freq_table, 40000);
+       cpufreq_generic_init(policy, s5pv210_freq_table, 40000);
+       return 0;
 
 out_dmc1:
        clk_put(dmc0_clk);