aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorMUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>2006-02-24 03:46:04 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-23 17:35:15 -0500
commit0cccd0c20677e8a9da40018632f1b6c487ba2bd5 (patch)
tree76a6c9b8c96034d877c7074eb64c7156ade27b0f /drivers/pci
parente27da3814170385a4d2797397d706e554635812d (diff)
[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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index dbfdac63cb49..21fa13e84470 100644
--- 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)
972 acpiphp_sanitize_bus(bus); 972 acpiphp_sanitize_bus(bus);
973 pci_enable_bridges(bus); 973 pci_enable_bridges(bus);
974 pci_bus_add_devices(bus); 974 pci_bus_add_devices(bus);
975 acpiphp_set_hpp_values(DEVICE_ACPI_HANDLE(&bus->self->dev), bus); 975 acpiphp_set_hpp_values(slot->bridge->handle, bus);
976 acpiphp_configure_ioapics(DEVICE_ACPI_HANDLE(&bus->self->dev)); 976 acpiphp_configure_ioapics(slot->bridge->handle);
977 977
978 /* associate pci_dev to our representation */ 978 /* associate pci_dev to our representation */
979 list_for_each (l, &slot->funcs) { 979 list_for_each (l, &slot->funcs) {