Commit c878a52d authored Jun 12, 2013 by Daniel Lezcano Committed by Rafael J. Wysocki Jul 15, 2013

cpuidle: Check if device is already registered



Make __cpuidle_register_device() check whether or not the device has
been registered already and return -EBUSY immediately if that's the
case.

[rjw: Changelog]
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 5df0aa73

drivers/cpuidle/cpuidle.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -400,13 +400,16 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
		*/
		int cpuidle_register_device(struct cpuidle_device *dev)
		{
		int ret;
		int ret = -EBUSY;

		if (!dev)
		return -EINVAL;

		mutex_lock(&cpuidle_lock);

		if (dev->registered)
		goto out_unlock;

		ret = __cpuidle_device_init(dev);
		if (ret)
		goto out_unlock;