diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 190cf402f1c88cb394f8744591be07b9906cb97c..1d340a0e08c9ef8428ad7ac1d8897129bce288bf 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1361,6 +1361,9 @@ int acpi_processor_power_init(struct acpi_processor *pr)
 		if (retval) {
 			if (acpi_processor_registered == 0)
 				cpuidle_unregister_driver(&acpi_idle_driver);
+
+			per_cpu(acpi_cpuidle_device, pr->id) = NULL;
+			kfree(dev);
 			return retval;
 		}
 		acpi_processor_registered++;