Skip to content

Commit

Permalink
Revert "PCI: get larger bridge ranges when space is available"
Browse files Browse the repository at this point in the history
This reverts commit 308cf8e.  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>
  • Loading branch information
Jesse Barnes committed Oct 27, 2009
1 parent 964fe08 commit 55a1098
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions drivers/pci/setup-bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 55a1098

Please sign in to comment.