Skip to content

Commit

Permalink
cpufreq: exynos: call CPUFREQ_POSTCHANGE notfier in error cases
Browse files Browse the repository at this point in the history
PRECHANGE and POSTCHANGE notifiers must be called in groups, i.e either both
should be called or both shouldn't be.

In case we have started PRECHANGE notifier and found an error, we must call
POSTCHANGE notifier with freqs.new = freqs.old to guarantee that sequence of
calling notifiers is complete.

This patch fixes it.

Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
  • Loading branch information
Viresh Kumar committed Jun 24, 2013
1 parent 803c126 commit c3aca6b
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/cpufreq/exynos-cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
if (ret) {
pr_err("%s: failed to set cpu voltage to %d\n",
__func__, arm_volt);
goto out;
freqs.new = freqs.old;
goto post_notify;
}
}

Expand All @@ -123,14 +124,19 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
if (ret) {
pr_err("%s: failed to set cpu voltage to %d\n",
__func__, safe_arm_volt);
goto out;
freqs.new = freqs.old;
goto post_notify;
}
}

exynos_info->set_freq(old_index, index);

post_notify:
cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);

if (ret)
goto out;

/* When the new frequency is lower than current frequency */
if ((freqs.new < freqs.old) ||
((freqs.new > freqs.old) && safe_arm_volt)) {
Expand Down

0 comments on commit c3aca6b

Please sign in to comment.