From 230be5f03f413f6281ca4d8bc1e96d262419010f Mon Sep 17 00:00:00 2001
From: Dirk Brandewie <dirk.brandewie@gmail.com>
Date: Wed, 6 Feb 2013 09:02:11 -0800
Subject: [PATCH] --- yaml --- r: 351051 b: refs/heads/master c:
 fa69e33f7d38e658583ff910642da7ea4515ad74 h: refs/heads/master i:   351049:
 187a536f37aef603dc6537741b28103ffd7506d0   351047:
 8a1b0f80c981f44c8f8ba6b581e4b816765c2c6c v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/cpufreq/cpufreq.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a70627a37a59..6fd6164eb272 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6b0515b078f641d00ca531a9f0ae34f3b05ec20
+refs/heads/master: fa69e33f7d38e658583ff910642da7ea4515ad74
diff --git a/trunk/drivers/cpufreq/cpufreq.c b/trunk/drivers/cpufreq/cpufreq.c
index 480c49c71afe..94117a7f219b 100644
--- a/trunk/drivers/cpufreq/cpufreq.c
+++ b/trunk/drivers/cpufreq/cpufreq.c
@@ -1025,8 +1025,9 @@ static int __cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif
 		__cpufreq_governor(data, CPUFREQ_GOV_STOP);
 
 #ifdef CONFIG_HOTPLUG_CPU
-	strncpy(per_cpu(cpufreq_cpu_governor, cpu), data->governor->name,
-			CPUFREQ_NAME_LEN);
+	if (!cpufreq_driver->setpolicy)
+		strncpy(per_cpu(cpufreq_cpu_governor, cpu),
+			data->governor->name, CPUFREQ_NAME_LEN);
 #endif
 
 	WARN_ON(lock_policy_rwsem_write(cpu));