diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-01-10 23:56:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-01-10 23:56:41 +0800 |
| commit | 60d29b4f9bf5466c1d6eccac414765b7ac2e8eb4 (patch) | |
| tree | 51ea304cd736ff03faa6bc568644a9d15b628d4a /drivers/cpufreq | |
| parent | 0a1e99e83990f72055eadd7ab5793b9f63e16834 (diff) | |
| parent | 450cdfa9c5713551ab1438ab210679868b52a994 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
include/linux/mm_types.h
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 9520e3b90bd..7054c579d45 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -543,6 +543,11 @@ static int intel_pstate_init_cpu(unsigned int cpunum) cpu = all_cpu_data[cpunum]; intel_pstate_get_cpu_pstates(cpu); + if (!cpu->pstate.current_pstate) { + all_cpu_data[cpunum] = NULL; + kfree(cpu); + return -ENODATA; + } cpu->cpu = cpunum; cpu->pstate_policy = |