Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / cpufreq / dbx500-cpufreq.c

diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index 6ec6539ae0418895a4b54619e98eeac7d647159c..1fdb02b9f1ec84f221e8ba26dfeefd53105eb9a3 100644 (file)
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -57,13 +57,13 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
        if (ret) {
                pr_err("dbx500-cpufreq: Failed to set armss_clk to %d Hz: error %d\n",
                       freqs.new * 1000, ret);
-               return ret;
+               freqs.new = freqs.old;
        }
 
        /* post change notification */
        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
-       return 0;
+       return ret;
 }
 
 static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)