aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Brandewie <dirk.j.brandewie@intel.com>2014-10-13 11:37:42 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-23 16:59:59 -0400
commitc034871712730a33e0267095f48b62eae958499c (patch)
tree5afe8d3fd20dbd8974a80de19dea5e0a449c47dd
parent4521e1a0ce173daa23dfef8312d09051e057ff8e (diff)
intel_pstate: Don't lose sysfs settings during cpu offline
The user may have custom settings don't destroy them during suspend. Link: https://bugzilla.kernel.org/show_bug.cgi?id=80651 Reported-by: Tobias Jakobi <liquid.acid@gmx.net> Cc: All applicable <stable@vger.kernel.org> Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/cpufreq/intel_pstate.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 5f5f5ed11691..97b349a6f5c7 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -702,7 +702,9 @@ static int intel_pstate_init_cpu(unsigned int cpunum)
702{ 702{
703 struct cpudata *cpu; 703 struct cpudata *cpu;
704 704
705 all_cpu_data[cpunum] = kzalloc(sizeof(struct cpudata), GFP_KERNEL); 705 if (!all_cpu_data[cpunum])
706 all_cpu_data[cpunum] = kzalloc(sizeof(struct cpudata),
707 GFP_KERNEL);
706 if (!all_cpu_data[cpunum]) 708 if (!all_cpu_data[cpunum])
707 return -ENOMEM; 709 return -ENOMEM;
708 710
@@ -783,8 +785,6 @@ static void intel_pstate_stop_cpu(struct cpufreq_policy *policy)
783 785
784 del_timer_sync(&all_cpu_data[cpu_num]->timer); 786 del_timer_sync(&all_cpu_data[cpu_num]->timer);
785 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate); 787 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
786 kfree(all_cpu_data[cpu_num]);
787 all_cpu_data[cpu_num] = NULL;
788} 788}
789 789
790static int intel_pstate_cpu_init(struct cpufreq_policy *policy) 790static int intel_pstate_cpu_init(struct cpufreq_policy *policy)