From 72ec65e923e9559b89bb7cbae9c43b8149fae9bc Mon Sep 17 00:00:00 2001
From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Mon, 29 Aug 2005 13:54:55 -0700
Subject: [PATCH] --- yaml --- r: 7999 b: refs/heads/master c:
 f914be79ab2144efe291d9fc383661e0e23dca44 h: refs/heads/master i:   7997:
 1e4869ce943ae49e7b9d4fac1a183344c7edb8e9   7995:
 5cef3955b7b31d8b03b760963d4adf470c4db70a   7991:
 467b695639be65c444e9bc824e209d22788dab58   7983:
 5683ca336d4f55232fb04d2cd6ee4a5fdce035f8   7967:
 1251ff37c8a290f9a659e267d0c6ae0e1e5d73b5   7935:
 b221087c8d062a02a19e9b51950fa2b997c42d75 v: v3

---
 [refs]                                             |  2 +-
 .../i386/kernel/cpu/cpufreq/speedstep-centrino.c   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e7fbb9fd216d..331f6b38a34b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8085e1f1f0645fc6ddefcb54fdcba95808df5049
+refs/heads/master: f914be79ab2144efe291d9fc383661e0e23dca44
diff --git a/trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index 327a55d4d1c6..95e15b7fce17 100644
--- a/trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/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 "