Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / pci / hotplug / acpiphp_glue.c

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 9ddf69e..74d38ca 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -132,6 +132,15 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
        if (!acpi_pci_check_ejectable(pbus, handle) && !is_dock_device(handle))
                return AE_OK;
 
+       status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
+       if (ACPI_FAILURE(status)) {
+               warn("can't evaluate _ADR (%#x)\n", status);
+               return AE_OK;
+       }
+
+       device = (adr >> 16) & 0xffff;
+       function = adr & 0xffff;
+
        pdev = pbus->self;
        if (pdev && pci_is_pcie(pdev)) {
                tmp = acpi_find_root_bridge_handle(pdev);
@@ -144,10 +153,6 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
                }
        }
 
-       acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
-       device = (adr >> 16) & 0xffff;
-       function = adr & 0xffff;
-
        newfunc = kzalloc(sizeof(struct acpiphp_func), GFP_KERNEL);
        if (!newfunc)
                return AE_NO_MEMORY;