1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 480c49c71afe..94117a7f219b 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/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));