1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 5675d9747e87..deefa8591746 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -616,7 +616,8 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
        acpi_processor_get_limit_info(pr);
-        acpi_processor_power_init(pr, device);
+        if (cpuidle_get_driver() == &acpi_idle_driver)
+                acpi_processor_power_init(pr, device);
        pr->cdev = thermal_cooling_device_register("Processor", device,
                                                &processor_cooling_ops);
@@ -920,9 +921,10 @@ static int __init acpi_processor_init(void)
        if (!acpi_processor_dir)
                return -ENOMEM;
 #endif
-        result = cpuidle_register_driver(&acpi_idle_driver);
-        if (result < 0)
+        if (!cpuidle_register_driver(&acpi_idle_driver))
-                goto out_proc;
+                printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
+                        acpi_idle_driver.name);
        result = acpi_bus_register_driver(&acpi_processor_driver);
        if (result < 0)
@@ -941,7 +943,6 @@ static int __init acpi_processor_init(void)
 out_cpuidle:
        cpuidle_unregister_driver(&acpi_idle_driver);
-out_proc:
 #ifdef CONFIG_ACPI_PROCFS
        remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
 #endif

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index 5675d9747e87..deefa8591746 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c
@@ -616,7 +616,8 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
616	acpi_processor_get_limit_info(pr);	616	acpi_processor_get_limit_info(pr);
617		617
618		618
619	acpi_processor_power_init(pr, device);	619	if (cpuidle_get_driver() == &acpi_idle_driver)
		620	acpi_processor_power_init(pr, device);
620		621
621	pr->cdev = thermal_cooling_device_register("Processor", device,	622	pr->cdev = thermal_cooling_device_register("Processor", device,
622	&processor_cooling_ops);	623	&processor_cooling_ops);
@@ -920,9 +921,10 @@ static int __init acpi_processor_init(void)
920	if (!acpi_processor_dir)	921	if (!acpi_processor_dir)
921	return -ENOMEM;	922	return -ENOMEM;
922	#endif	923	#endif
923	result = cpuidle_register_driver(&acpi_idle_driver);	924
924	if (result < 0)	925	if (!cpuidle_register_driver(&acpi_idle_driver))
925	goto out_proc;	926	printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
		927	acpi_idle_driver.name);
926		928
927	result = acpi_bus_register_driver(&acpi_processor_driver);	929	result = acpi_bus_register_driver(&acpi_processor_driver);
928	if (result < 0)	930	if (result < 0)
@@ -941,7 +943,6 @@ static int __init acpi_processor_init(void)
941	out_cpuidle:	943	out_cpuidle:
942	cpuidle_unregister_driver(&acpi_idle_driver);	944	cpuidle_unregister_driver(&acpi_idle_driver);
943		945
944	out_proc:
945	#ifdef CONFIG_ACPI_PROCFS	946	#ifdef CONFIG_ACPI_PROCFS
946	remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);	947	remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
947	#endif	948	#endif