diff options
| author | Yu Zhao <yu.zhao@intel.com> | 2008-11-22 02:41:07 +0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 11:13:03 -0800 |
| commit | 3789fa8a2e534523c896a32a9f27f78d52ad7d82 (patch) | |
| tree | 1bed5285a1188bf2455554118616403a8f929637 /drivers/pci | |
| parent | 0b400c7ed4d027e02f6231afa39852a2d48e6f25 (diff) | |
| download | kernel_samsung_smdk4412-3789fa8a2e534523c896a32a9f27f78d52ad7d82.tar.gz kernel_samsung_smdk4412-3789fa8a2e534523c896a32a9f27f78d52ad7d82.tar.bz2 kernel_samsung_smdk4412-3789fa8a2e534523c896a32a9f27f78d52ad7d82.zip | |
PCI: allow pci_alloc_child_bus() to handle a NULL bridge
Allow pci_alloc_child_bus() to allocate buses without bridge devices.
Some SR-IOV devices can occupy more than one bus number, but there is no
explicit bridges because that have internal routing mechanism.
Signed-off-by: Yu Zhao <yu.zhao@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/probe.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 5372d3699e0..2ee00962734 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -398,12 +398,10 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, if (!child) return NULL; - child->self = bridge; child->parent = parent; child->ops = parent->ops; child->sysdata = parent->sysdata; child->bus_flags = parent->bus_flags; - child->bridge = get_device(&bridge->dev); /* initialize some portions of the bus device, but don't register it * now as the parent is not properly set up yet. This device will get @@ -420,6 +418,12 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, child->primary = parent->secondary; child->subordinate = 0xff; + if (!bridge) + return child; + + child->self = bridge; + child->bridge = get_device(&bridge->dev); + /* Set up default resource pointers and names.. */ for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) { child->resource[i] = &bridge->resource[PCI_BRIDGE_RESOURCES+i]; |