[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <201205032250.26434.rjw@sisk.pl>
Date: Thu, 3 May 2012 22:50:26 +0200
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: linux-pm@...ts.linux-foundation.org
Cc: Colin Cross <ccross@...roid.com>, linux-kernel@...r.kernel.org,
Kevin Hilman <khilman@...com>, Len Brown <len.brown@...el.com>,
Russell King <linux@....linux.org.uk>,
"Greg Kroah-Hartman" <gregkh@...uxfoundation.org>,
Kay Sievers <kay.sievers@...y.org>,
Amit Kucheria <amit.kucheria@...aro.org>,
Arjan van de Ven <arjan@...ux.intel.com>,
Arnd Bergmann <arnd.bergmann@...aro.org>,
linux-arm-kernel@...ts.infradead.org
Subject: Re: [linux-pm] [PATCHv3 2/5] cpuidle: fix error handling in __cpuidle_register_device
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@...com>
> Tested-by: Santosh Shilimkar <santosh.shilimkar@...com>
> Reviewed-by: Kevin Hilman <khilman@...com>
> Tested-by: Kevin Hilman <khilman@...com>
> Signed-off-by: Colin Cross <ccross@...roid.com>
Reviewed-by: Rafael J. Wysocki <rjw@...k.pl>
> ---
> 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;
> }
>
> /**
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists