---

yaml --- r: 283365 b: refs/heads/master c: 79e77f2 h: refs/heads/master i: 283363: 29255c9 v: v3
git-mirror · Jan 6, 2012 · 93ae58b · 93ae58b
1 parent 856b332
commit 93ae58b
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: e2a7965ee07360c448ffa4eb3d5ccee01c42251e
+refs/heads/master: 79e77f27f52264768a393f8bafb548d3776f993e
diff --git a/trunk/arch/ia64/pci/pci.c b/trunk/arch/ia64/pci/pci.c
@@ -387,8 +387,11 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
 	 * should handle the case here, but it appears that IA64 hasn't
 	 * such quirk. So we just ignore the case now.
 	 */
-	pbus = pci_scan_bus_parented(NULL, bus, &pci_root_ops, controller);
+	pbus = pci_create_bus(NULL, bus, &pci_root_ops, controller);
+	if (!pbus)
+		return NULL;
 
+	pbus->subordinate = pci_scan_child_bus(pbus);
 	return pbus;
 
 out3: