---

yaml --- r: 336707 b: refs/heads/master c: 0676f7f h: refs/heads/master i: 336705: 8c70dc3 336703: 34d14e4 v: v3
git-mirror · Nov 14, 2012 · ec549cb · ec549cb
1 parent 785f578
commit ec549cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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;