From 399bc74fd4a597e4d7d2abd3127cc283b2cafc6d Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Thu, 17 May 2012 18:51:13 -0700
Subject: [PATCH] --- yaml --- r: 316444 b: refs/heads/master c:
 d0a350fe57c0a4014a8eccf8166d7dc2e599ce5c h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/pci/hotplug/ibmphp_core.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f52bf7a5bfaa..cf29b3f3363e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 450878759aa10c6d172a0cafd5922b23a3b4547a
+refs/heads/master: d0a350fe57c0a4014a8eccf8166d7dc2e599ce5c
diff --git a/trunk/drivers/pci/hotplug/ibmphp_core.c b/trunk/drivers/pci/hotplug/ibmphp_core.c
index 4fda7e6a86a7..a62f296e8b0d 100644
--- a/trunk/drivers/pci/hotplug/ibmphp_core.c
+++ b/trunk/drivers/pci/hotplug/ibmphp_core.c
@@ -805,9 +805,11 @@ static int ibm_configure_device(struct pci_func *func)
 		}
 	}
 	if (!(flag) && (func->dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)) {
+		int max;
 		pci_read_config_byte(func->dev, PCI_SECONDARY_BUS, &bus);
 		child = pci_add_new_bus(func->dev->bus, func->dev, bus);
-		pci_do_scan_bus(child);
+		max = pci_do_scan_bus(child);
+		pci_bus_update_busn_res_end(child, max);
 	}
 
 	return 0;