Commit b69ef2c0 authored Apr 06, 2016 by Richard Cochran Committed by Rafael J. Wysocki Apr 07, 2016

intel_idle: Don't overreact to a cpuidle registration failure.



The helper function, intel_idle_cpu_init, registers one new device
with the cpuidle layer.  If the registration should fail, that
function immediately calls intel_idle_cpuidle_devices_uninit() to
unregister every last CPU's device.  However, it makes no sense to do
so, when called from the hot plug notifier callback.

This patch moves the call to intel_idle_cpuidle_devices_uninit()
outside of the helper function to the one call site that actually
needs to perform the de-registrations.

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>

parent 2259a819

drivers/idle/intel_idle.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1175,7 +1175,6 @@ static int intel_idle_cpu_init(int cpu)

		if (cpuidle_register_device(dev)) {
		pr_debug(PREFIX "cpuidle_register_device %d failed!\n", cpu);
		intel_idle_cpuidle_devices_uninit();
		return -EIO;
		}

		@@ -1219,6 +1218,7 @@ static int __init intel_idle_init(void)
		for_each_online_cpu(i) {
		retval = intel_idle_cpu_init(i);
		if (retval) {
		intel_idle_cpuidle_devices_uninit();
		cpu_notifier_register_done();
		cpuidle_unregister_driver(&intel_idle_driver);
		free_percpu(intel_idle_cpuidle_devices);