Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9df69cc authored by Richard Cochran's avatar Richard Cochran Committed by Rafael J. Wysocki
Browse files

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: default avatarRichard Cochran <rcochran@linutronix.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 51319918

drivers/idle/intel_idle.c

+5 −4
Original line number Diff line number Diff line
@@ -1210,19 +1210,20 @@ static int __init intel_idle_init(void) 
	if (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();

	retval = cpuidle_register_driver(&intel_idle_driver);

	if (retval) {

		struct cpuidle_driver *drv = cpuidle_get_driver();

		printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",

			drv ? drv->name : "none");

		free_percpu(intel_idle_cpuidle_devices);

		return retval;

	}



	intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);

	if (intel_idle_cpuidle_devices == NULL)

		return -ENOMEM;



	cpu_notifier_register_begin();



	for_each_online_cpu(i) {