From 93ae58bd4aab648e69786fddc290dec84cf97c99 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 28 Oct 2011 16:26:26 -0600
Subject: [PATCH] --- yaml --- r: 283365 b: refs/heads/master c:
 79e77f27f52264768a393f8bafb548d3776f993e h: refs/heads/master i:   283363:
 29255c97dc5e049ad3b51d1892a32ecf5abeaaaf v: v3

---
 [refs]                    | 2 +-
 trunk/arch/ia64/pci/pci.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 61e33762b2d6..e95f597f4101 100644
--- 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
index 99f232c50bd1..3f9c86ad00fa 100644
--- 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: