diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 09:17:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 09:17:02 -0700 |
| commit | 066455d471e997adbcc98dda62eaf461e8b6556e (patch) | |
| tree | 4d9b6fb879dff695fa242702d7c4635687ae829d /drivers | |
| parent | ea38280c2a6e22997cf05bfea0d9391ddea1da24 (diff) | |
| parent | 55a1098476619d5d8f4cdae7240ea759274dead7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
Revert "PCI: get larger bridge ranges when space is available"
Diffstat (limited to 'drivers')
| -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 0959430534b..cb1a027eb55 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; } |