---

yaml --- r: 123011 b: refs/heads/master c: b5ae5f9 h: refs/heads/master i: 123009: 046edbd 123007: d1cac3e v: v3
git-mirror · Nov 5, 2008 · d957296 · d957296
1 parent a56f201
commit d957296
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57b066ff4ec53a0ac7cbf7fb363bb670cf58ddae
+refs/heads/master: b5ae5f911d221ad85090d6805ab9ab020f6e4703
diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c
@@ -1243,9 +1243,12 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus)
 	int i;
 	struct resource *res, *pr;
 
+	pr_debug("PCI: Allocating bus resources for %04x:%02x...\n",
+		 pci_domain_nr(bus), bus->number);
+
 	for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) {
 		if ((res = bus->resource[i]) == NULL || !res->flags
-		    || res->start > res->end)
+		    || res->start > res->end || res->parent)
 			continue;
 		if (bus->parent == NULL)
 			pr = (res->flags & IORESOURCE_IO) ?