diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 17:24:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 17:24:34 -0700 |
| commit | 529980c8b0b04e8a3f6606cdc156f1f81a5d68cd (patch) | |
| tree | 2e9c548cb6c82c609c805911141638332a7a4a5b /drivers | |
| parent | e3e3679cfc1c6689e035f6d69606253b1eda63ca (diff) | |
| parent | 52c18fd2dc5c6d96cec4f48c69fc17b00edd9860 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 10b01498238..109d62ccf65 100644 --- 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) - goto err_out; + goto err_out_driver_exit; /* 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); +err_out_driver_exit: + if (cpufreq_driver->exit) + cpufreq_driver->exit(policy); + err_out: kfree(policy); |