From ec549cb3597b03eef7f8906b46fae0ad974cdc1a Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Wed, 24 Oct 2012 23:39:48 +0200 Subject: [PATCH] --- yaml --- r: 336707 b: refs/heads/master c: 0676f7f2e7d2adec11f40320ca43a8897b8ef906 h: refs/heads/master i: 336705: 8c70dc3276c519c8486266c90973a1039cf9dd74 336703: 34d14e41a38e6aadba3bdb769eb39ef84ea4d43a v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/cpufreq.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6ba7271fadb5..1177d4402ffe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8636fd280e970696be62c8495a5aacb5f3b6237d +refs/heads/master: 0676f7f2e7d2adec11f40320ca43a8897b8ef906 diff --git a/trunk/drivers/cpufreq/cpufreq.c b/trunk/drivers/cpufreq/cpufreq.c index 85df5387bc61..f552d5fe0f8f 100644 --- a/trunk/drivers/cpufreq/cpufreq.c +++ b/trunk/drivers/cpufreq/cpufreq.c @@ -1511,12 +1511,14 @@ int __cpufreq_driver_getavg(struct cpufreq_policy *policy, unsigned int cpu) { int ret = 0; + if (!(cpu_online(cpu) && cpufreq_driver->getavg)) + return 0; + policy = cpufreq_cpu_get(policy->cpu); if (!policy) return -EINVAL; - if (cpu_online(cpu) && cpufreq_driver->getavg) - ret = cpufreq_driver->getavg(policy, cpu); + ret = cpufreq_driver->getavg(policy, cpu); cpufreq_cpu_put(policy); return ret;