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 / omap-cpufreq.c

diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index 0279d18a57f96499bc3f67a5a9c4e8e0ce785081..29468a522ee9a799180b8cf18b178bb43d16acb7 100644 (file)
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -93,9 +93,6 @@ static int omap_target(struct cpufreq_policy *policy,
        if (freqs.old == freqs.new && policy->cur == freqs.new)
                return ret;
 
-       /* notifiers */
-       cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
-
        freq = freqs.new * 1000;
        ret = clk_round_rate(mpu_clk, freq);
        if (IS_ERR_VALUE(ret)) {
@@ -125,6 +122,9 @@ static int omap_target(struct cpufreq_policy *policy,
                freqs.old / 1000, volt_old ? volt_old / 1000 : -1,
                freqs.new / 1000, volt ? volt / 1000 : -1);
 
+       /* notifiers */
+       cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+
        /* scaling up?  scale voltage before frequency */
        if (mpu_reg && (freqs.new > freqs.old)) {
                r = regulator_set_voltage(mpu_reg, volt - tol, volt + tol);