diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-26 00:00:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-26 00:00:41 +0100 |
| commit | 04e780d9cc5d55b07286a5ecbc455c027a81ab7f (patch) | |
| tree | 5d92bce991e84f84468c7374eb292dd0a1682d13 /drivers/cpufreq/cpufreq_stats.c | |
| parent | c04ee7fcbfba1471af90cf6407370efc779c1243 (diff) | |
| parent | 81a464838675307c9fc7909fc840f248ed2caed5 (diff) | |
Merge tag 'v3.10.3' into linux-linaro-lsk
This is the 3.10.3 stable release
Diffstat (limited to 'drivers/cpufreq/cpufreq_stats.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq_stats.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c index c44338b60fc..1db214b2660 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c @@ -354,13 +354,11 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb, cpufreq_update_policy(cpu); break; case CPU_DOWN_PREPARE: + case CPU_DOWN_PREPARE_FROZEN: cpufreq_stats_free_sysfs(cpu); break; case CPU_DEAD: - cpufreq_stats_free_table(cpu); - break; - case CPU_UP_CANCELED_FROZEN: - cpufreq_stats_free_sysfs(cpu); + case CPU_DEAD_FROZEN: cpufreq_stats_free_table(cpu); break; } |