From e3f79bbd0568317586946c9f526a890c3455a373 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 17 May 2012 18:51:13 -0700 Subject: [PATCH] --- yaml --- r: 316445 b: refs/heads/master c: 85019faf4a88477cc72f56b6e371955ea0bb7a2a h: refs/heads/master i: 316443: 968b52744e72b76a4b0b55d2ec5f080ddf0d1db2 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/sgi_hotplug.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cf29b3f3363e..a0a04a549d9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0a350fe57c0a4014a8eccf8166d7dc2e599ce5c +refs/heads/master: 85019faf4a88477cc72f56b6e371955ea0bb7a2a diff --git a/trunk/drivers/pci/hotplug/sgi_hotplug.c b/trunk/drivers/pci/hotplug/sgi_hotplug.c index de573113c102..b0bb3b537bb0 100644 --- a/trunk/drivers/pci/hotplug/sgi_hotplug.c +++ b/trunk/drivers/pci/hotplug/sgi_hotplug.c @@ -398,11 +398,13 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot) 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); - pci_scan_child_bus(new_bus); + max = pci_scan_child_bus(new_bus); + pci_bus_update_busn_res_end(new_bus, max); new_ppb = 1; } pci_dev_put(dev);