ACPI: scan: Rearrange initialization of ACPI device objects

[linux-2.6-microblaze.git] / drivers / acpi / power.c

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 8c4a73a..2ae48ab 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -944,7 +944,8 @@ struct acpi_device *acpi_add_power_resource(acpi_handle handle)
                return NULL;
 
        device = &resource->device;
-       acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER);
+       acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER,
+                               acpi_release_power_resource);
        mutex_init(&resource->resource_lock);
        INIT_LIST_HEAD(&resource->list_node);
        INIT_LIST_HEAD(&resource->dependents);
@@ -968,7 +969,7 @@ struct acpi_device *acpi_add_power_resource(acpi_handle handle)
        pr_info("%s [%s]\n", acpi_device_name(device), acpi_device_bid(device));
 
        device->flags.match_driver = true;
-       result = acpi_device_add(device, acpi_release_power_resource);
+       result = acpi_device_add(device);
        if (result)
                goto err;