summaryrefslogtreecommitdiff
path: root/drivers/cpufreq/cppc_cpufreq.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-12-21 13:46:30 +0300
committerTakashi Iwai <tiwai@suse.de>2015-12-21 13:46:30 +0300
commit1d9d4495001d3c470e5c902ff35a6aa626924fc1 (patch)
tree1ae39f4ccadb610bc16fea88a1f93b23a4df37b1 /drivers/cpufreq/cppc_cpufreq.c
parentd3d33aabac51341065bcce0e9c2d9d27902a08c4 (diff)
parente2dc7d7d8ed3019f72855af1c3dcda3fb456b488 (diff)
downloadlinux-1d9d4495001d3c470e5c902ff35a6aa626924fc1.tar.xz
Merge branch 'topic/hdmi-jack' into for-next
Diffstat (limited to 'drivers/cpufreq/cppc_cpufreq.c')
-rw-r--r--drivers/cpufreq/cppc_cpufreq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
index e8cb334094b0..7c0bdfb1a2ca 100644
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
@@ -98,10 +98,11 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
policy->max = cpu->perf_caps.highest_perf;
policy->cpuinfo.min_freq = policy->min;
policy->cpuinfo.max_freq = policy->max;
+ policy->shared_type = cpu->shared_type;
if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
cpumask_copy(policy->cpus, cpu->shared_cpu_map);
- else {
+ else if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL) {
/* Support only SW_ANY for now. */
pr_debug("Unsupported CPU co-ord type\n");
return -EFAULT;