Merge tag 'vmwgfx-fixes-3.14-2014-02-05' of git://people.freedesktop.org/~thomash...

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

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 146ab7e2b81d71949908ce43754e7b08bcaee022..c1c35623550fd723e74a63d5abfaea1ef724e3ab 100644 (file)
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -224,9 +224,9 @@ static int __acpi_processor_start(struct acpi_device *device)
 
 static int acpi_processor_start(struct device *dev)
 {
-       struct acpi_device *device;
+       struct acpi_device *device = ACPI_COMPANION(dev);
 
-       if (acpi_bus_get_device(ACPI_HANDLE(dev), &device))
+       if (!device)
                return -ENODEV;
 
        return __acpi_processor_start(device);
@@ -234,10 +234,10 @@ static int acpi_processor_start(struct device *dev)
 
 static int acpi_processor_stop(struct device *dev)
 {
-       struct acpi_device *device;
+       struct acpi_device *device = ACPI_COMPANION(dev);
        struct acpi_processor *pr;
 
-       if (acpi_bus_get_device(ACPI_HANDLE(dev), &device))
+       if (!device)
                return 0;
 
        acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,