From 4dc0c11acea83630e21fb04db9c8d974c841fa15 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Mon, 14 Jul 2008 11:59:44 +0900
Subject: [PATCH] --- yaml --- r: 110791 b: refs/heads/master c:
 847aef6ffd85787b62395b64719f8f7c5975bf1b h: refs/heads/master i:   110789:
 f8b806be8e897b31c0db18374ea5b3116d54b301   110787:
 2d25409ae3a5a30b109f2790477df57de946ae44   110783:
 32b5eff5bc3a6213879a504b7d787b89cb82e190 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9b2da076b98d..74d3901dfb07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d2d2051e50c4ca0207a42b243369e22f7d90a5c
+refs/heads/master: 847aef6ffd85787b62395b64719f8f7c5975bf1b
diff --git a/trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index dd097b835839..1def5b06fa4a 100644
--- a/trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -785,7 +785,11 @@ static int __init acpi_cpufreq_init(void)
 	if (ret)
 		return ret;
 
-	return cpufreq_register_driver(&acpi_cpufreq_driver);
+	ret = cpufreq_register_driver(&acpi_cpufreq_driver);
+	if (ret)
+		free_percpu(acpi_perf_data);
+
+	return ret;
 }
 
 static void __exit acpi_cpufreq_exit(void)
@@ -795,8 +799,6 @@ static void __exit acpi_cpufreq_exit(void)
 	cpufreq_unregister_driver(&acpi_cpufreq_driver);
 
 	free_percpu(acpi_perf_data);
-
-	return;
 }
 
 module_param(acpi_pstate_strict, uint, 0644);