diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
| commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
| tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /drivers/cpufreq/cpufreq.c | |
| parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 64926aa990db..89a29cd93783 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
| @@ -1006,14 +1006,6 @@ static int __cpufreq_remove_dev (struct sys_device * sys_dev) | |||
| 1006 | } | 1006 | } |
| 1007 | #endif | 1007 | #endif |
| 1008 | 1008 | ||
| 1009 | |||
| 1010 | if (!kobject_get(&data->kobj)) { | ||
| 1011 | spin_unlock_irqrestore(&cpufreq_driver_lock, flags); | ||
| 1012 | cpufreq_debug_enable_ratelimit(); | ||
| 1013 | unlock_policy_rwsem_write(cpu); | ||
| 1014 | return -EFAULT; | ||
| 1015 | } | ||
| 1016 | |||
| 1017 | #ifdef CONFIG_SMP | 1009 | #ifdef CONFIG_SMP |
| 1018 | 1010 | ||
| 1019 | #ifdef CONFIG_HOTPLUG_CPU | 1011 | #ifdef CONFIG_HOTPLUG_CPU |