From 1d9e193aa20f1da32b69c95f5c1c62695ca53950 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Mon, 5 Jun 2006 14:03:50 -0400
Subject: [PATCH] --- yaml --- r: 27453 b: refs/heads/master c:
 436fe7b8b4a5016ef1fcb32bff77bde84003e15d h: refs/heads/master i:   27451:
 daa43005fcfc638070a727fd5900c6df49b66d57 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/i386/kernel/cpu/cpufreq/powernow-k7.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 129acf337a34..df2f8c3a8ddc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b10eec2246690f069febd3aa9578decd5ffb3f5b
+refs/heads/master: 436fe7b8b4a5016ef1fcb32bff77bde84003e15d
diff --git a/trunk/arch/i386/kernel/cpu/cpufreq/powernow-k7.c b/trunk/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
index 5d2b601425b8..694d4793bf6a 100644
--- a/trunk/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
+++ b/trunk/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
@@ -581,10 +581,7 @@ static int __init powernow_cpu_init (struct cpufreq_policy *policy)
 
 	rdmsrl (MSR_K7_FID_VID_STATUS, fidvidstatus.val);
 
-	/* recalibrate cpu_khz */
-	result = recalibrate_cpu_khz();
-	if (result)
-		return result;
+	recalibrate_cpu_khz();
 
 	fsb = (10 * cpu_khz) / fid_codes[fidvidstatus.bits.CFID];
 	if (!fsb) {