diff options
| author | Javi Merino <javi.merino@arm.com> | 2015-03-11 11:53:05 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-03-11 14:02:17 +0000 |
| commit | 048f3979e6cc5a28a028218a9181d49350f93d67 (patch) | |
| tree | b27e13bd4bdd24be52eb7c91f02c8803c006bd6f | |
| parent | e1425c72cb78dc368e94939479f93328ae25555e (diff) | |
fixup! thermal: cpu_cooling: implement the power cooling device APIlsk-3.10-armlt-ipa-new
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | drivers/thermal/cpu_cooling.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 10416fbfce27..a1507ae371db 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -359,7 +359,9 @@ static int cpufreq_thermal_notifier(struct notifier_block *nb, switch (event) { case CPUFREQ_ADJUST: - mutex_lock(&cooling_cpufreq_lock); + if (notify_device == NOTIFY_INVALID) + return NOTIFY_DONE; + if (cpumask_test_cpu(policy->cpu, ¬ify_device->allowed_cpus)) max_freq = notify_device->cpufreq_val; else @@ -372,7 +374,6 @@ static int cpufreq_thermal_notifier(struct notifier_block *nb, if (policy->max != max_freq) cpufreq_verify_within_limits(policy, 0, max_freq); - mutex_unlock(&cooling_cpufreq_lock); break; default: |