Only unregister acpi_idle driver if acpi_idle driver got registered. On latest Nehalem/Sandybridge this is not the case, but the intel_idle driver is used instead. Signed-off-by: Thomas Renninger <trenn@xxxxxxx> CC: Len Brown <lenb@xxxxxxxxxx> CC: linux-acpi@xxxxxxxxxxxxxxx --- drivers/acpi/processor_driver.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index a4e0f1b..9247e67 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -823,7 +823,8 @@ static int __init acpi_processor_init(void) return 0; out_cpuidle: - cpuidle_unregister_driver(&acpi_idle_driver); + if (cpuidle_get_driver() == &acpi_idle_driver) + cpuidle_unregister_driver(&acpi_idle_driver); return result; } @@ -841,7 +842,8 @@ static void __exit acpi_processor_exit(void) acpi_bus_unregister_driver(&acpi_processor_driver); - cpuidle_unregister_driver(&acpi_idle_driver); + if (cpuidle_get_driver() == &acpi_idle_driver) + cpuidle_unregister_driver(&acpi_idle_driver); return; } -- 1.7.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
