Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-microblaze.git] / drivers / cpufreq / tegra20-cpufreq.c

diff --git a/drivers/cpufreq/tegra20-cpufreq.c b/drivers/cpufreq/tegra20-cpufreq.c
index 3c32cc7..f84ecd2 100644 (file)
--- a/drivers/cpufreq/tegra20-cpufreq.c
+++ b/drivers/cpufreq/tegra20-cpufreq.c
@@ -118,17 +118,11 @@ static int tegra_target(struct cpufreq_policy *policy, unsigned int index)
 static int tegra_cpu_init(struct cpufreq_policy *policy)
 {
        struct tegra20_cpufreq *cpufreq = cpufreq_get_driver_data();
-       int ret;
 
        clk_prepare_enable(cpufreq->cpu_clk);
 
        /* FIXME: what's the actual transition time? */
-       ret = cpufreq_generic_init(policy, freq_table, 300 * 1000);
-       if (ret) {
-               clk_disable_unprepare(cpufreq->cpu_clk);
-               return ret;
-       }
-
+       cpufreq_generic_init(policy, freq_table, 300 * 1000);
        policy->clk = cpufreq->cpu_clk;
        policy->suspend_freq = freq_table[0].frequency;
        return 0;