From: Viresh Kumar Date: Wed, 19 Jun 2013 08:52:55 +0000 (+0530) Subject: cpufreq: ACPI: call CPUFREQ_POSTCHANGE notfier in error cases X-Git-Tag: upstream/snapshot3+hdmi~4790^2~1^2~5^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e15d8309e961ea960dbe40f94fd7ac64f8efe3f6;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git cpufreq: ACPI: call CPUFREQ_POSTCHANGE notfier in error cases 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 the sequence of calling notifiers is complete. This patch fixes it. Signed-off-by: Viresh Kumar Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 0d25677..1f9849d 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -494,12 +494,14 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, pr_debug("acpi_cpufreq_target failed (%d)\n", policy->cpu); result = -EAGAIN; - goto out; + freqs.new = freqs.old; } } cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); - perf->state = next_perf_state; + + if (!result) + perf->state = next_perf_state; out: return result;