| From c034871712730a33e0267095f48b62eae958499c Mon Sep 17 00:00:00 2001 |
| From: Dirk Brandewie <dirk.j.brandewie@intel.com> |
| Date: Mon, 13 Oct 2014 08:37:42 -0700 |
| Subject: intel_pstate: Don't lose sysfs settings during cpu offline |
| |
| From: Dirk Brandewie <dirk.j.brandewie@intel.com> |
| |
| commit c034871712730a33e0267095f48b62eae958499c upstream. |
| |
| 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> |
| Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com> |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/cpufreq/intel_pstate.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/cpufreq/intel_pstate.c |
| +++ b/drivers/cpufreq/intel_pstate.c |
| @@ -702,7 +702,9 @@ static int intel_pstate_init_cpu(unsigne |
| { |
| struct cpudata *cpu; |
| |
| - all_cpu_data[cpunum] = kzalloc(sizeof(struct cpudata), GFP_KERNEL); |
| + if (!all_cpu_data[cpunum]) |
| + all_cpu_data[cpunum] = kzalloc(sizeof(struct cpudata), |
| + GFP_KERNEL); |
| if (!all_cpu_data[cpunum]) |
| return -ENOMEM; |
| |
| @@ -783,8 +785,6 @@ static void intel_pstate_stop_cpu(struct |
| |
| del_timer_sync(&all_cpu_data[cpu_num]->timer); |
| intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate); |
| - kfree(all_cpu_data[cpu_num]); |
| - all_cpu_data[cpu_num] = NULL; |
| } |
| |
| static int intel_pstate_cpu_init(struct cpufreq_policy *policy) |
