diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-26 00:01:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-26 00:01:00 +0100 |
| commit | 535ad2c06cf12f3f075e3d9a141476beb367ae6b (patch) | |
| tree | 7ab4365d17bf07bd636177fb1c485a1ba899c5ea /drivers/cpufreq/cpufreq.c | |
| parent | 9f6772da061814c2962aeb7d79231f7510dba313 (diff) | |
| parent | 04e780d9cc5d55b07286a5ecbc455c027a81ab7f (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index c6ab21880c0..e3d7112e9ef 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1885,13 +1885,15 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb, if (dev) { switch (action) { case CPU_ONLINE: + case CPU_ONLINE_FROZEN: cpufreq_add_dev(dev, NULL); break; case CPU_DOWN_PREPARE: - case CPU_UP_CANCELED_FROZEN: + case CPU_DOWN_PREPARE_FROZEN: __cpufreq_remove_dev(dev, NULL); break; case CPU_DOWN_FAILED: + case CPU_DOWN_FAILED_FROZEN: cpufreq_add_dev(dev, NULL); break; } |