Merge remote-tracking branch 'scsi/for-next'

[karo-tx-linux.git] / drivers / acpi / processor_driver.c

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 51e658f21e956fd66895d431971bb56449c74e56..f4e02ae93f585fbb8de42c09d4d0fb32d2751887 100644 (file)
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -242,6 +242,10 @@ static int __acpi_processor_start(struct acpi_device *device)
        if (pr->flags.need_hotplug_init)
                return 0;
 
+       result = acpi_cppc_processor_probe(pr);
+       if (result)
+               return -ENODEV;
+
        if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
                acpi_processor_power_init(pr);
 
@@ -287,6 +291,8 @@ static int acpi_processor_stop(struct device *dev)
 
        acpi_pss_perf_exit(pr, device);
 
+       acpi_cppc_processor_exit(pr);
+
        return 0;
 }