Merge branch 'fixes-merge-window-pt2' into fixes

[linux.git] / drivers / cpufreq / davinci-cpufreq.c

diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c
index 3de48ae60c292d6dc7ead88de6cbb0594e61eda3..297d23cad8b5f0110f2a43b1ade1e9174d454616 100644 (file)
--- a/drivers/cpufreq/davinci-cpufreq.c
+++ b/drivers/cpufreq/davinci-cpufreq.c
@@ -90,7 +90,8 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)
         * Setting the latency to 2000 us to accommodate addition of drivers
         * to pre/post change notification list.
         */
-       return cpufreq_generic_init(policy, freq_table, 2000 * 1000);
+       cpufreq_generic_init(policy, freq_table, 2000 * 1000);
+       return 0;
 }
 
 static struct cpufreq_driver davinci_driver = {