diff options
| author |   Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-10-27 09:39:18 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-10-27 09:39:18 -0700 |
| commit | 55a1098476619d5d8f4cdae7240ea759274dead7 (patch) | |
| tree | 841931bc1c5297788c28f55b4ba2a73d7a22442d /drivers/pci | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| download | linux-dev-55a1098476619d5d8f4cdae7240ea759274dead7.tar.xz linux-dev-55a1098476619d5d8f4cdae7240ea759274dead7.zip | |
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')
| -rw-r--r-- | drivers/pci/setup-bus.c | 13 |
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 r = bus->resource[i]; if (r == &ioport_resource || r == &iomem_resource) continue; - if (r && (r->flags & type_mask) == type) { - if (!r->parent) - return r; - /* - * if there is no child under that, we should release - * and use it. don't need to reset it, pbus_size_* will - * set it again - */ - if (!r->child && !release_resource(r)) - return r; - } + if (r && (r->flags & type_mask) == type && !r->parent) + return r; } return NULL; } |