diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-08-08 13:39:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-08-08 13:39:40 +0800 |
| commit | d93f53b34077d40e4de13d70663193b359be6a26 (patch) | |
| tree | 079c8df608deb1dccdb7fba985bb8b5c1b41c80b /drivers/cpufreq | |
| parent | 48b5efd4cf3ad5f7cb0993cf0362600fe010e56c (diff) | |
| parent | e21af7dfe5795138dc2466dc5684d3297acd48a9 (diff) | |
Merge tag 'v3.14.16' into linux-linaro-lsk-v3.14
This is 3.14.16 stable release
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 199b52b7c3e1..153f4b92cc05 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1089,10 +1089,12 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif, * the creation of a brand new one. So we need to perform this update * by invoking update_policy_cpu(). */ - if (frozen && cpu != policy->cpu) + if (frozen && cpu != policy->cpu) { update_policy_cpu(policy, cpu); - else + WARN_ON(kobject_move(&policy->kobj, &dev->kobj)); + } else { policy->cpu = cpu; + } policy->governor = CPUFREQ_DEFAULT_GOVERNOR; cpumask_copy(policy->cpus, cpumask_of(cpu)); |