---

yaml --- r: 316441 b: refs/heads/master c: f406384 h: refs/heads/master i: 316439: ba899fb v: v3
git-mirror · Jun 13, 2012 · 57866eb · 57866eb
1 parent 9db107f
commit 57866eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc76b7310a352be1c2ed24133e89c5df24eff05e
+refs/heads/master: f406384628e97618955e17e8d61e59d5ecdc9ca0
diff --git a/trunk/drivers/pci/hotplug/cpci_hotplug_pci.c b/trunk/drivers/pci/hotplug/cpci_hotplug_pci.c
@@ -294,6 +294,7 @@ int __ref cpci_configure_slot(struct slot *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),
@@ -312,7 +313,8 @@ int __ref cpci_configure_slot(struct slot *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_dev_put(dev);