git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Remove TXCRC compile option for BCSP driver
[pandora-kernel.git]
/
drivers
/
cpufreq
/
cpufreq.c
diff --git
a/drivers/cpufreq/cpufreq.c
b/drivers/cpufreq/cpufreq.c
index
bf62dfe
..
109d62c
100644
(file)
--- a/
drivers/cpufreq/cpufreq.c
+++ b/
drivers/cpufreq/cpufreq.c
@@
-627,7
+627,7
@@
static int cpufreq_add_dev (struct sys_device * sys_dev)
ret = kobject_register(&policy->kobj);
if (ret)
ret = kobject_register(&policy->kobj);
if (ret)
- goto err_out;
+ goto err_out
_driver_exit
;
/* set up files for this cpu device */
drv_attr = cpufreq_driver->attr;
/* set up files for this cpu device */
drv_attr = cpufreq_driver->attr;
@@
-673,6
+673,10
@@
err_out_unregister:
kobject_unregister(&policy->kobj);
wait_for_completion(&policy->kobj_unregister);
kobject_unregister(&policy->kobj);
wait_for_completion(&policy->kobj_unregister);
+err_out_driver_exit:
+ if (cpufreq_driver->exit)
+ cpufreq_driver->exit(policy);
+
err_out:
kfree(policy);
err_out:
kfree(policy);
@@
-869,7
+873,7
@@
EXPORT_SYMBOL(cpufreq_get);
* cpufreq_suspend - let the low level driver prepare for suspend
*/
* cpufreq_suspend - let the low level driver prepare for suspend
*/
-static int cpufreq_suspend(struct sys_device * sysdev,
u32 state
)
+static int cpufreq_suspend(struct sys_device * sysdev,
pm_message_t pmsg
)
{
int cpu = sysdev->id;
unsigned int ret = 0;
{
int cpu = sysdev->id;
unsigned int ret = 0;
@@
-897,7
+901,7
@@
static int cpufreq_suspend(struct sys_device * sysdev, u32 state)
}
if (cpufreq_driver->suspend) {
}
if (cpufreq_driver->suspend) {
- ret = cpufreq_driver->suspend(cpu_policy,
state
);
+ ret = cpufreq_driver->suspend(cpu_policy,
pmsg
);
if (ret) {
printk(KERN_ERR "cpufreq: suspend failed in ->suspend "
"step on CPU %u\n", cpu_policy->cpu);
if (ret) {
printk(KERN_ERR "cpufreq: suspend failed in ->suspend "
"step on CPU %u\n", cpu_policy->cpu);
@@
-1130,7
+1134,7
@@
int cpufreq_driver_target(struct cpufreq_policy *policy,
unsigned int target_freq,
unsigned int relation)
{
unsigned int target_freq,
unsigned int relation)
{
-
unsigned
int ret;
+ int ret;
policy = cpufreq_cpu_get(policy->cpu);
if (!policy)
policy = cpufreq_cpu_get(policy->cpu);
if (!policy)
@@
-1151,7
+1155,7
@@
EXPORT_SYMBOL_GPL(cpufreq_driver_target);
static int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event)
{
static int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event)
{
- int ret
= -EINVAL
;
+ int ret;
if (!try_module_get(policy->governor->owner))
return -EINVAL;
if (!try_module_get(policy->governor->owner))
return -EINVAL;