From 003a5e41bb6a99934996eb6fd28d346ea191da1f Mon Sep 17 00:00:00 2001 From: Afzal Mohammed Date: Wed, 4 Jan 2012 10:52:46 +0530 Subject: [PATCH] --- yaml --- r: 283507 b: refs/heads/master c: d08de0c19c3fc5b9cf557ce3b42795d036ad5da9 h: refs/heads/master i: 283505: 3801a5958e246104ee641f9a2922ce4eff7b0c35 283503: 063d1e0a6e11821ed119ffd9297ef7fc92fce829 v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/cpufreq.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 228bd603b9f6..2a5cd2bc989e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 226dd0193f9b8524789a86505ba05b1a74d916c1 +refs/heads/master: d08de0c19c3fc5b9cf557ce3b42795d036ad5da9 diff --git a/trunk/drivers/cpufreq/cpufreq.c b/trunk/drivers/cpufreq/cpufreq.c index 987a165ede26..2f5801adc739 100644 --- a/trunk/drivers/cpufreq/cpufreq.c +++ b/trunk/drivers/cpufreq/cpufreq.c @@ -204,8 +204,7 @@ static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci) pr_debug("saving %lu as reference value for loops_per_jiffy; " "freq is %u kHz\n", l_p_j_ref, l_p_j_ref_freq); } - if ((val == CPUFREQ_PRECHANGE && ci->old < ci->new) || - (val == CPUFREQ_POSTCHANGE && ci->old > ci->new) || + if ((val == CPUFREQ_POSTCHANGE && ci->old != ci->new) || (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) { loops_per_jiffy = cpufreq_scale(l_p_j_ref, l_p_j_ref_freq, ci->new);