summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorKristen Accardi <kristen.c.accardi@intel.com>2005-12-14 09:37:26 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-09 12:13:20 -0800
commitc64b5eead93f9d3a8ca0e9ca0ffba0b99dc565b9 (patch)
treed4debea2e49260151a78d67362805a0746e755aa /drivers/pci
parent9f3f4681291fc88864bb27f8f3832b95bb53aae5 (diff)
downloadop-kernel-dev-c64b5eead93f9d3a8ca0e9ca0ffba0b99dc565b9.zip
op-kernel-dev-c64b5eead93f9d3a8ca0e9ca0ffba0b99dc565b9.tar.gz
[PATCH] acpiphp: only size new bus
Only size the bus that has been added. Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 8e21f6ab..509a5b3 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -794,12 +794,14 @@ static int enable_device(struct acpiphp_slot *slot)
if (PCI_SLOT(dev->devfn) != slot->device)
continue;
if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
- dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
+ dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
max = pci_scan_bridge(bus, dev, max, pass);
+ if (pass && dev->subordinate)
+ pci_bus_size_bridges(dev->subordinate);
+ }
}
}
- pci_bus_size_bridges(bus);
pci_bus_assign_resources(bus);
acpiphp_sanitize_bus(bus);
pci_enable_bridges(bus);
OpenPOWER on IntegriCloud