From: Jonghwan Choi Date: Tue, 5 Feb 2013 05:01:22 +0000 (-0800) Subject: cpufreq: exynos: Fix hang in pm handler due to frequency mismatch X-Git-Tag: v3.12-rc1~1425^2~2^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c098ea74b268969bde5aaf1689b61d236abf82f5;p=kernel%2Fkernel-generic.git cpufreq: exynos: Fix hang in pm handler due to frequency mismatch When pm handler set freq & voltage, frequency mismatch occurred. Because freqs.new isn't set in pm handler. Signed-off-by: Jonghwan Choi Signed-off-by: Kukjin Kim --- diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c index f48ba52..67e89ef 100644 --- a/drivers/cpufreq/exynos-cpufreq.c +++ b/drivers/cpufreq/exynos-cpufreq.c @@ -69,9 +69,10 @@ static int exynos_cpufreq_scale(unsigned int target_freq) int ret = 0; freqs.old = policy->cur; + freqs.new = target_freq; freqs.cpu = policy->cpu; - if (target_freq == freqs.old) + if (freqs.new == freqs.old) goto out; /* @@ -159,6 +160,7 @@ static int exynos_target(struct cpufreq_policy *policy, { struct cpufreq_frequency_table *freq_table = exynos_info->freq_table; unsigned int index; + unsigned int new_freq; int ret = 0; mutex_lock(&cpufreq_lock); @@ -172,9 +174,9 @@ static int exynos_target(struct cpufreq_policy *policy, goto out; } - freqs.new = freq_table[index].frequency; + new_freq = freq_table[index].frequency; - ret = exynos_cpufreq_scale(freqs.new); + ret = exynos_cpufreq_scale(new_freq); out: mutex_unlock(&cpufreq_lock);