From adff42b1c54cd001d28d4d0ad21127b9be6d4812 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Wed, 3 Sep 2003 02:42:28 +0100 Subject: [PATCH] [CPUFREQ] Fix various oddities in the userspace governer. --- drivers/cpufreq/cpufreq_userspace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c index 7df32a97c50a4..9f51fbe9b1494 100644 --- a/drivers/cpufreq/cpufreq_userspace.c +++ b/drivers/cpufreq/cpufreq_userspace.c @@ -498,9 +498,9 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy, unsigned int cpu = policy->cpu; switch (event) { case CPUFREQ_GOV_START: - if ((!cpu_online(cpu)) || (!try_module_get(THIS_MODULE)) || - !policy->cur) + if ((!cpu_online(cpu)) || (!try_module_get(THIS_MODULE))) return -EINVAL; + BUG_ON(!policy->cur); down(&userspace_sem); cpu_is_managed[cpu] = 1; cpu_min_freq[cpu] = policy->min; @@ -551,7 +551,7 @@ static void cpufreq_sa11x0_compat(void) #endif -static struct cpufreq_governor cpufreq_gov_userspace = { +struct cpufreq_governor cpufreq_gov_userspace = { .name = "userspace", .governor = cpufreq_governor_userspace, .owner = THIS_MODULE, @@ -587,5 +587,5 @@ MODULE_AUTHOR ("Dominik Brodowski , Russell King