---

yaml
---
r: 7999
b: refs/heads/master
c: f914be7
h: refs/heads/master
i:
  7997: 1e4869c
  7995: 5cef395
  7991: 467b695
  7983: 5683ca3
  7967: 1251ff3
  7935: b221087
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8085e1f1f0645fc6ddefcb54fdcba95808df5049
+refs/heads/master: f914be79ab2144efe291d9fc383661e0e23dca44

trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c

@@ -498,13 +498,6 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
 	if (cpu->x86_vendor != X86_VENDOR_INTEL || !cpu_has(cpu, X86_FEATURE_EST))
 		return -ENODEV;
 
-	for (i = 0; i < N_IDS; i++)
-		if (centrino_verify_cpu_id(cpu, &cpu_ids[i]))
-			break;
-
-	if (i != N_IDS)
-		centrino_cpu[policy->cpu] = &cpu_ids[i];
-
 	if (is_const_loops_cpu(policy->cpu)) {
 		centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
 	}
@@ -513,6 +506,13 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
 		if (policy->cpu != 0)
 			return -ENODEV;
 
+		for (i = 0; i < N_IDS; i++)
+			if (centrino_verify_cpu_id(cpu, &cpu_ids[i]))
+				break;
+
+		if (i != N_IDS)
+			centrino_cpu[policy->cpu] = &cpu_ids[i];
+
 		if (!centrino_cpu[policy->cpu]) {
 			dprintk(KERN_INFO PFX "found unsupported CPU with "
 			"Enhanced SpeedStep: send /proc/cpuinfo to "