From kristen.c.accardi@intel.com Wed Dec 14 09:40:15 2005 Subject: acpiphp: only size new bus From: Kristen Accardi To: Kenji Kaneshige Cc: , greg@kroah.com Date: Wed, 14 Dec 2005 09:37:26 -0800 Message-Id: <1134581846.6118.1.camel@whizzy> Only size the bus that has been added. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman --- drivers/pci/hotplug/acpiphp_glue.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- gregkh-2.6.orig/drivers/pci/hotplug/acpiphp_glue.c +++ gregkh-2.6/drivers/pci/hotplug/acpiphp_glue.c @@ -794,12 +794,14 @@ static int enable_device(struct acpiphp_ 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);