commit 63fb273363b3a314dc1e312e25a210d7f6654213
author Linux Build Service Account <lnxbuild@localhost> Mon Mar 04 14:59:06 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Mar 04 14:59:06 2013 -0800
tree 654917dd27323059437abb9d1fdd25916fd5cc9f
parent 909c192794d02fc5375c65de2cf903bed5bb2091
parent 69003bf129fb042aea730628385a1d2361073b60

Merge "cpuidle: fix error handling in __cpuidle_register_device"

drivers/cpuidle/cpuidle.c

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 @@
 
 	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;
 }
 
 /**