Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 10b014982381..109d62ccf651 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);