[PATCH] acpiphp: fix bridge handle

When hotplug slot is under the host bridge,
DEVICE_ACPI_HANDLE(&bus->self->dev) fails since '&bus->self' was not set.
This patch fixes it.

This patch is based on kristen's latest patches.
I tested this patch on my Tiger4.

Signed-off-by: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index dbfdac63cb4955d22c8694144834d697c33a1264..21fa13e8447030e3b6c58f2b253e6b7608821b15 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -972,8 +972,8 @@ static int enable_device(struct acpiphp_slot *slot)
        acpiphp_sanitize_bus(bus);
        pci_enable_bridges(bus);
        pci_bus_add_devices(bus);
-       acpiphp_set_hpp_values(DEVICE_ACPI_HANDLE(&bus->self->dev), bus);
-       acpiphp_configure_ioapics(DEVICE_ACPI_HANDLE(&bus->self->dev));
+       acpiphp_set_hpp_values(slot->bridge->handle, bus);
+       acpiphp_configure_ioapics(slot->bridge->handle);
 
        /* associate pci_dev to our representation */
        list_for_each (l, &slot->funcs) {