From 968b52744e72b76a4b0b55d2ec5f080ddf0d1db2 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: 316443 b: refs/heads/master c:
 450878759aa10c6d172a0cafd5922b23a3b4547a h: refs/heads/master i:   316441:
 57866eba8b084a7f9699988feedf73ef2f981530   316439:
 ba899fb5d543d665d59e5b9cf995bd8805416470 v: v3

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

diff --git a/[refs] b/[refs]
index a36e86d52b02..f52bf7a5bfaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cda0fcf26df18f0e5476fbff12845cc46e1f41b
+refs/heads/master: 450878759aa10c6d172a0cafd5922b23a3b4547a
diff --git a/trunk/drivers/pci/hotplug/cpqphp_pci.c b/trunk/drivers/pci/hotplug/cpqphp_pci.c
index 1c8494021a42..24716725263f 100644
--- a/trunk/drivers/pci/hotplug/cpqphp_pci.c
+++ b/trunk/drivers/pci/hotplug/cpqphp_pci.c
@@ -106,9 +106,11 @@ int cpqhp_configure_device (struct controller* ctrl, struct pci_func* func)
 	}
 
 	if (func->pci_dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
+		int max;
 		pci_read_config_byte(func->pci_dev, PCI_SECONDARY_BUS, &bus);
 		child = (struct pci_bus*) pci_add_new_bus(func->pci_dev->bus, (func->pci_dev), bus);
-		pci_do_scan_bus(child);
+		max = pci_do_scan_bus(child);
+		pci_bus_update_busn_res_end(child, max);
 	}
 
 	pci_dev_put(func->pci_dev);