---

yaml --- r: 316452 b: refs/heads/master c: 69ba29b h: refs/heads/master v: v3
git-mirror · Jun 13, 2012 · 367faf9 · 367faf9
1 parent 6a9b964
commit 367faf9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d7abf32925f1a8aeeb37234c8ea7590ebbe62be
+refs/heads/master: 69ba29b9f91317b0cb8a4891c0cc6270a6f77ec9
diff --git a/trunk/drivers/pci/hotplug/sgi_hotplug.c b/trunk/drivers/pci/hotplug/sgi_hotplug.c
@@ -397,15 +397,11 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
 			else
 				sn_io_slot_fixup(dev);
 			if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-				unsigned char sec_bus;
-				int max;
-				pci_read_config_byte(dev, PCI_SECONDARY_BUS,
-						     &sec_bus);
-				new_bus = pci_add_new_bus(dev->bus, dev,
-							  sec_bus);
-				max = pci_scan_child_bus(new_bus);
-				pci_bus_update_busn_res_end(new_bus, max);
-				new_ppb = 1;
+				pci_hp_add_bridge(dev);
+				if (dev->subordinate) {
+					new_bus = dev->subordinate;
+					new_ppb = 1;
+				}
 			}
 			pci_dev_put(dev);
 		}