diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-14 13:39:53 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-14 13:39:53 -0800 |
commit | d1e4e83a8275c2e504721c6118b45355a41b4a7a (patch) | |
tree | 83fb54c087a8a9b516579f2cb9d2695e417fa4b7 /pci | |
parent | e62d1a68ce38e18af8fac4d09916eebc4fb9d1cd (diff) | |
download | patches-d1e4e83a8275c2e504721c6118b45355a41b4a7a.tar.gz |
more patches
Diffstat (limited to 'pci')
-rw-r--r-- | pci/acpiphp-only-size-new-bus.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/pci/acpiphp-only-size-new-bus.patch b/pci/acpiphp-only-size-new-bus.patch new file mode 100644 index 0000000000000..4ed9f5571270d --- /dev/null +++ b/pci/acpiphp-only-size-new-bus.patch @@ -0,0 +1,36 @@ +From kristen.c.accardi@intel.com Wed Dec 14 09:40:15 2005 +Subject: acpiphp: only size new bus +From: Kristen Accardi <kristen.c.accardi@intel.com> +To: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> +Cc: <rajesh.shah@intel.com>, 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 <kristen.c.accardi@intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + 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); |