aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/setup-bus.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2009-10-27 12:39:18 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-10-27 12:39:18 -0400
commit55a1098476619d5d8f4cdae7240ea759274dead7 (patch)
tree841931bc1c5297788c28f55b4ba2a73d7a22442d /drivers/pci/setup-bus.c
parent964fe080d94db82a3268443e9b9ece4c60246414 (diff)
Revert "PCI: get larger bridge ranges when space is available"
This reverts commit 308cf8e13f42f476dfd6552aeff58fdc0788e566. This patch had trouble with transparent bridges, among other things. A more readable and correct version should land in 2.6.33. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/setup-bus.c')
-rw-r--r--drivers/pci/setup-bus.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 0959430534b2..cb1a027eb552 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -299,17 +299,8 @@ static struct resource *find_free_bus_resource(struct pci_bus *bus, unsigned lon
299 r = bus->resource[i]; 299 r = bus->resource[i];
300 if (r == &ioport_resource || r == &iomem_resource) 300 if (r == &ioport_resource || r == &iomem_resource)
301 continue; 301 continue;
302 if (r && (r->flags & type_mask) == type) { 302 if (r && (r->flags & type_mask) == type && !r->parent)
303 if (!r->parent) 303 return r;
304 return r;
305 /*
306 * if there is no child under that, we should release
307 * and use it. don't need to reset it, pbus_size_* will
308 * set it again
309 */
310 if (!r->child && !release_resource(r))
311 return r;
312 }
313 } 304 }
314 return NULL; 305 return NULL;
315} 306}