X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fpci%2Fsetup-bus.c;h=c1bdfb424658ab03bf6e62bd088fe2ed637b80ab;hb=b3539219c9ea20ebf6a5ea3cc534f423a3607c41;hp=6b628de948af522fd3f00fdb7b4725a2c6cf275d;hpb=542df5de56a23bf2d94b75e2b304ab0e5a5508a8;p=linux-2.6

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 6b628de948..c1bdfb4246 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -273,6 +273,8 @@ find_free_bus_resource(struct pci_bus *bus, unsigned long type)
 
 	for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
 		r = bus->resource[i];
+		if (r == &ioport_resource || r == &iomem_resource)
+			continue;
 		if (r && (r->flags & type_mask) == type && !r->parent)
 			return r;
 	}