Browse Source

intel_idle: Fix dangling registration on error path.

In the module_init() method, if the per-CPU allocation fails, then the
active cpuidle registration is not cleaned up.  This patch fixes the
issue by attempting the allocation before registration, and then
cleaning it up again on registration failure.

Signed-off-by: Richard Cochran <rcochran@linutronix.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Richard Cochran 9 years ago
parent
commit
e9df69ccd1
1 changed files with 5 additions and 4 deletions
  1. 5 4
      drivers/idle/intel_idle.c

+ 5 - 4
drivers/idle/intel_idle.c

@@ -1210,19 +1210,20 @@ static int __init intel_idle_init(void)
 	if (retval)
 	if (retval)
 		return retval;
 		return retval;
 
 
+	intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);
+	if (intel_idle_cpuidle_devices == NULL)
+		return -ENOMEM;
+
 	intel_idle_cpuidle_driver_init();
 	intel_idle_cpuidle_driver_init();
 	retval = cpuidle_register_driver(&intel_idle_driver);
 	retval = cpuidle_register_driver(&intel_idle_driver);
 	if (retval) {
 	if (retval) {
 		struct cpuidle_driver *drv = cpuidle_get_driver();
 		struct cpuidle_driver *drv = cpuidle_get_driver();
 		printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
 		printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
 			drv ? drv->name : "none");
 			drv ? drv->name : "none");
+		free_percpu(intel_idle_cpuidle_devices);
 		return retval;
 		return retval;
 	}
 	}
 
 
-	intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);
-	if (intel_idle_cpuidle_devices == NULL)
-		return -ENOMEM;
-
 	cpu_notifier_register_begin();
 	cpu_notifier_register_begin();
 
 
 	for_each_online_cpu(i) {
 	for_each_online_cpu(i) {