aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/cpufreq/cpufreq.c4
-rw-r--r--drivers/cpufreq/cpufreq_stats.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 2d53f47d1747..178fe7a69056 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1837,13 +1837,15 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
1837 if (dev) { 1837 if (dev) {
1838 switch (action) { 1838 switch (action) {
1839 case CPU_ONLINE: 1839 case CPU_ONLINE:
1840 case CPU_ONLINE_FROZEN:
1840 cpufreq_add_dev(dev, NULL); 1841 cpufreq_add_dev(dev, NULL);
1841 break; 1842 break;
1842 case CPU_DOWN_PREPARE: 1843 case CPU_DOWN_PREPARE:
1843 case CPU_UP_CANCELED_FROZEN: 1844 case CPU_DOWN_PREPARE_FROZEN:
1844 __cpufreq_remove_dev(dev, NULL); 1845 __cpufreq_remove_dev(dev, NULL);
1845 break; 1846 break;
1846 case CPU_DOWN_FAILED: 1847 case CPU_DOWN_FAILED:
1848 case CPU_DOWN_FAILED_FROZEN:
1847 cpufreq_add_dev(dev, NULL); 1849 cpufreq_add_dev(dev, NULL);
1848 break; 1850 break;
1849 } 1851 }
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 591b6fb641b2..bfd6273fd873 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -353,13 +353,11 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
353 cpufreq_update_policy(cpu); 353 cpufreq_update_policy(cpu);
354 break; 354 break;
355 case CPU_DOWN_PREPARE: 355 case CPU_DOWN_PREPARE:
356 case CPU_DOWN_PREPARE_FROZEN:
356 cpufreq_stats_free_sysfs(cpu); 357 cpufreq_stats_free_sysfs(cpu);
357 break; 358 break;
358 case CPU_DEAD: 359 case CPU_DEAD:
359 cpufreq_stats_free_table(cpu); 360 case CPU_DEAD_FROZEN:
360 break;
361 case CPU_UP_CANCELED_FROZEN:
362 cpufreq_stats_free_sysfs(cpu);
363 cpufreq_stats_free_table(cpu); 361 cpufreq_stats_free_table(cpu);
364 break; 362 break;
365 } 363 }