Merge branch 'pm-cpufreq-arm' into pm-cpufreq

[linux-imx.git] / drivers / cpufreq / tegra-cpufreq.c

diff --git a/drivers/cpufreq/tegra-cpufreq.c b/drivers/cpufreq/tegra-cpufreq.c
index 81561be17e8c55162600c0e6256998bb2b6d4a33..cd66b85d927caa47d5080f5c8b8da4bd03c51686 100644 (file)
--- a/drivers/cpufreq/tegra-cpufreq.c
+++ b/drivers/cpufreq/tegra-cpufreq.c
@@ -137,12 +137,12 @@ static int tegra_update_cpu_speed(struct cpufreq_policy *policy,
        if (ret) {
                pr_err("cpu-tegra: Failed to set cpu frequency to %d kHz\n",
                        freqs.new);
-               return ret;
+               freqs.new = freqs.old;
        }
 
        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
-       return 0;
+       return ret;
 }
 
 static unsigned long tegra_cpu_highest_speed(void)