ACPI PCI hotplug: harden against panic regression

[linux-2.6-omap-h63xx.git] / drivers / pci / hotplug / acpiphp_glue.c

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index f09b1010d477f64ce804d1c0a73d7e952192d34d..803d9ddd6e75f0fb2334c905c89c6f626657e656 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -266,6 +266,8 @@ static int detect_ejectable_slots(struct pci_bus *pbus)
        int found = acpi_pci_detect_ejectable(pbus);
        if (!found) {
                acpi_handle bridge_handle = acpi_pci_get_bridge_handle(pbus);
+               if (!bridge_handle)
+                       return 0;
                acpi_walk_namespace(ACPI_TYPE_DEVICE, bridge_handle, (u32)1,
                                    is_pci_dock_device, (void *)&found, NULL);
        }