From 2d007ceecec1a3cf2ccf0c6c3425b9958dd90607 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: 316442 b: refs/heads/master c:
 6cda0fcf26df18f0e5476fbff12845cc46e1f41b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 26b5e5398544..a36e86d52b02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f406384628e97618955e17e8d61e59d5ecdc9ca0
+refs/heads/master: 6cda0fcf26df18f0e5476fbff12845cc46e1f41b
diff --git a/trunk/drivers/pci/hotplug/shpchp_pci.c b/trunk/drivers/pci/hotplug/shpchp_pci.c
index d021eb031b3c..13069802b8c8 100644
--- a/trunk/drivers/pci/hotplug/shpchp_pci.c
+++ b/trunk/drivers/pci/hotplug/shpchp_pci.c
@@ -66,6 +66,7 @@ int __ref shpchp_configure_device(struct slot *p_slot)
 			struct pci_bus *child;
 			unsigned char busnr, start = parent->busn_res.start;
 			unsigned char end = parent->busn_res.end;
+			int max;
 			for (busnr = start; busnr <= end; busnr++) {
 				if (!pci_find_bus(pci_domain_nr(parent),
 							busnr))
@@ -84,7 +85,8 @@ int __ref shpchp_configure_device(struct slot *p_slot)
 				pci_dev_put(dev);
 				continue;
 			}
-			child->busn_res.end = pci_do_scan_bus(child);
+			max = pci_do_scan_bus(child);
+			pci_bus_update_busn_res_end(child, max);
 			pci_bus_size_bridges(child);
 		}
 		pci_configure_slot(dev);