Commit 066455d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents ea38280c 55a10984

drivers/pci/setup-bus.c

+2 −11
Original line number Diff line number Diff line
@@ -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)

		if (r && (r->flags & type_mask) == type && !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;

		}

	}

	return NULL;

}