diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 10:12:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 10:12:37 +0200 |
| commit | 1a618c2cfe4c02190d8d1f9c5052f0defc58de20 (patch) | |
| tree | 170002288786f702e1d4ca638b53d1594a7caa16 /drivers/cpufreq/cpufreq.c | |
| parent | 03d85a63ee3e2d3a43460f936b86334b32f88c89 (diff) | |
| parent | 8482716b9d865db34c55d4bf2fed19498e7195b9 (diff) | |
| download | linux-1a618c2cfe4c02190d8d1f9c5052f0defc58de20.tar.bz2 | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index b87596b591b3..e93405f0eac4 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1491,6 +1491,9 @@ static unsigned int cpufreq_update_current_freq(struct cpufreq_policy *policy) { unsigned int new_freq; + if (cpufreq_suspended) + return 0; + new_freq = cpufreq_driver->get(policy->cpu); if (!new_freq) return 0; |