diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-01 00:41:12 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-01 00:41:12 +0200 |
| commit | 2c843bd92ec276ecb68504b3b5ffa7066183f032 (patch) | |
| tree | 2e853cc5ac0b7ec74d7c08d584b8d983c1a3e866 /drivers/cpufreq | |
| parent | 2cc6ced132f472b2bdb619960a650b9a85cdd34f (diff) | |
| parent | f51e1eb63d9c28cec188337ee656a13be6980cfd (diff) | |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq: Fix cpufreq regression after suspend/resume
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq_stats.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c index 6d35caa9116..cd9e81713a7 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c @@ -349,6 +349,7 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb, switch (action) { case CPU_ONLINE: + case CPU_ONLINE_FROZEN: cpufreq_update_policy(cpu); break; case CPU_DOWN_PREPARE: |