From d484462e8e8b9d90e8f0143e0c0ae50ce98fa348 Mon Sep 17 00:00:00 2001 From: Gary Hade Date: Wed, 3 Oct 2007 15:55:51 -0700 Subject: [PATCH] --- yaml --- r: 68039 b: refs/heads/master c: 8fa5913d54f3b1e09948e6a0db34da887e05ff1f h: refs/heads/master i: 68037: d825d9495e9d4df506fca9e05a759ad2a498765d 68035: 161b5a16c15a211714495cc6bbdd037dd8ffd3af 68031: 218e50d4c8c3607aec46adbdc46199ab44e7f382 v: v3 --- [refs] | 2 +- trunk/drivers/pci/setup-bus.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 260ee642fd70..adce563c16a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecb3908046ce9ce7feb44e2c2cf77ccdbe231f70 +refs/heads/master: 8fa5913d54f3b1e09948e6a0db34da887e05ff1f diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c index 5e5191ec8de6..401e03c920bd 100644 --- a/trunk/drivers/pci/setup-bus.c +++ b/trunk/drivers/pci/setup-bus.c @@ -472,7 +472,12 @@ void pci_bus_size_bridges(struct pci_bus *bus) break; case PCI_CLASS_BRIDGE_PCI: + /* don't size subtractive decoding (transparent) + * PCI-to-PCI bridges */ + if (bus->self->transparent) + break; pci_bridge_check_ranges(bus); + /* fall through */ default: pbus_size_io(bus); /* If the bridge supports prefetchable range, size it