Commit 3af272ab authored May 07, 2012 by Colin Cross Committed by Len Brown Jun 02, 2012

cpuidle: fix error handling in __cpuidle_register_device



Fix the error handling in __cpuidle_register_device to include
the missing list_del.  Move it to a label, which will simplify
the error handling when coupled states are added.

Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Tested-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Colin Cross <ccross@android.com>
Reviewed-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 56cfbf74

drivers/cpuidle/cpuidle.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -403,13 +403,18 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)

		per_cpu(cpuidle_devices, dev->cpu) = dev;
		list_add(&dev->device_list, &cpuidle_detected_devices);
		if ((ret = cpuidle_add_sysfs(cpu_dev))) {
		module_put(cpuidle_driver->owner);
		return ret;
		}
		ret = cpuidle_add_sysfs(cpu_dev);
		if (ret)
		goto err_sysfs;

		dev->registered = 1;
		return 0;

		err_sysfs:
		list_del(&dev->device_list);
		per_cpu(cpuidle_devices, dev->cpu) = NULL;
		module_put(cpuidle_driver->owner);
		return ret;
		}

		/**