From b4760db07c6202a2d0cf779c3603e5929c0dd99a Mon Sep 17 00:00:00 2001 From: Rajesh Shah Date: Thu, 28 Apr 2005 00:25:49 -0700 Subject: [PATCH] --- yaml --- r: 3845 b: refs/heads/master c: 6ef6f0e33c4645fc8d23201ad5a6a289b4303cbb h: refs/heads/master i: 3843: c6a9a17661f42591c30072ba5cc9fe37a453f625 v: v3 --- [refs] | 2 +- trunk/drivers/pci/bus.c | 11 +++++++---- trunk/drivers/pci/probe.c | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 519f04b98a3a..7e98e5cc2e69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4ea9bb7e9f177e03a917b1f1213de0315f819ee +refs/heads/master: 6ef6f0e33c4645fc8d23201ad5a6a289b4303cbb diff --git a/trunk/drivers/pci/bus.c b/trunk/drivers/pci/bus.c index dbd33605cc10..fedae89d8f7d 100644 --- a/trunk/drivers/pci/bus.c +++ b/trunk/drivers/pci/bus.c @@ -121,10 +121,13 @@ void __devinit pci_bus_add_devices(struct pci_bus *bus) * If there is an unattached subordinate bus, attach * it and then scan for unattached PCI devices. */ - if (dev->subordinate && list_empty(&dev->subordinate->node)) { - spin_lock(&pci_bus_lock); - list_add_tail(&dev->subordinate->node, &dev->bus->children); - spin_unlock(&pci_bus_lock); + if (dev->subordinate) { + if (list_empty(&dev->subordinate->node)) { + spin_lock(&pci_bus_lock); + list_add_tail(&dev->subordinate->node, + &dev->bus->children); + spin_unlock(&pci_bus_lock); + } pci_bus_add_devices(dev->subordinate); sysfs_create_link(&dev->subordinate->class_dev.kobj, &dev->dev.kobj, "bridge"); diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index 7d171f83257f..6a0a82f0508b 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/drivers/pci/probe.c @@ -450,7 +450,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max return max; } - child = pci_alloc_child_bus(bus, dev, busnr); + child = pci_add_new_bus(bus, dev, busnr); if (!child) return max; child->primary = buses & 0xFF; @@ -477,7 +477,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max * This can happen when a bridge is hot-plugged */ if (pci_find_bus(pci_domain_nr(bus), max+1)) return max; - child = pci_alloc_child_bus(bus, dev, ++max); + child = pci_add_new_bus(bus, dev, ++max); buses = (buses & 0xff000000) | ((unsigned int)(child->primary) << 0) | ((unsigned int)(child->secondary) << 8)