On Monday, April 30, 2012, Colin Cross wrote:
> 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@xxxxxx>
> Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
> Reviewed-by: Kevin Hilman <khilman@xxxxxx>
> Tested-by: Kevin Hilman <khilman@xxxxxx>
> Signed-off-by: Colin Cross <ccross@xxxxxxxxxxx>
Reviewed-by: Rafael J. Wysocki <rjw@xxxxxxx>
> ---
> drivers/cpuidle/cpuidle.c | 13 +++++++++----
> 1 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
> index 3e3e3e4..4540672 100644
> --- a/drivers/cpuidle/cpuidle.c
> +++ b/drivers/cpuidle/cpuidle.c
> @@ -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;
> }
>
> /**
>
_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/linux-pm
