From 6dc82832fd03aa6f47c7584dc56ac0b37fa50fd2 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 17 May 2009 10:23:52 -0400 Subject: [PATCH] --- yaml --- r: 145287 b: refs/heads/master c: 42a06f2166f2f6f7bf04f32b4e823eacdceafdc9 h: refs/heads/master i: 145285: 1e78f79fcbf54087a5d81656e8108926c16089e0 145283: 1c749053bdf38a595b267c88cbe4839a63679011 145279: c6cdc61242e78e96426a37a77ddbc8e4eb0ba812 v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/cpufreq.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5db8c93fa037..7b40fec77ff2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d38e73e8dad454a5916f446b0d3523c1161ae95a +refs/heads/master: 42a06f2166f2f6f7bf04f32b4e823eacdceafdc9 diff --git a/trunk/drivers/cpufreq/cpufreq.c b/trunk/drivers/cpufreq/cpufreq.c index d270e8eb3e67..47d2ad0ae079 100644 --- a/trunk/drivers/cpufreq/cpufreq.c +++ b/trunk/drivers/cpufreq/cpufreq.c @@ -1070,11 +1070,11 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev) spin_unlock_irqrestore(&cpufreq_driver_lock, flags); #endif + unlock_policy_rwsem_write(cpu); + if (cpufreq_driver->target) __cpufreq_governor(data, CPUFREQ_GOV_STOP); - unlock_policy_rwsem_write(cpu); - kobject_put(&data->kobj); /* we need to make sure that the underlying kobj is actually