diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 14:24:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 14:24:19 -0400 |
| commit | 8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6 (patch) | |
| tree | f846fcbf6b756b76834e06e412a8248bbfb55b32 /drivers/pci/setup-bus.c | |
| parent | 6a5d263866d699ebf6843105497afc86ee53de5b (diff) | |
| parent | 72800360fdd782eda3489e555adf3b6b3abc064a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: pci_slot: grab refcount on slot's bus
PCI Hotplug: acpiphp: grab refcount on p2p subordinate bus
PCI: allow PCI core hotplug to remove PCI root bus
PCI: Fix oops in pci_vpd_truncate
PCI: don't corrupt enable_cnt when doing manual resource alignment
PCI: annotate pci_rescan_bus as __ref, not __devinit
PCI-IOV: fix missing kernel-doc
PCI: Setup disabled bridges even if buses are added
PCI: SR-IOV quirk for Intel 82576 NIC
Diffstat (limited to 'drivers/pci/setup-bus.c')
| -rw-r--r-- | drivers/pci/setup-bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 334285a8e237..8d9da9d30a61 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
| @@ -144,7 +144,7 @@ static void pci_setup_bridge(struct pci_bus *bus) | |||
| 144 | struct pci_bus_region region; | 144 | struct pci_bus_region region; |
| 145 | u32 l, bu, lu, io_upper16; | 145 | u32 l, bu, lu, io_upper16; |
| 146 | 146 | ||
| 147 | if (!pci_is_root_bus(bus) && bus->is_added) | 147 | if (pci_is_enabled(bridge)) |
| 148 | return; | 148 | return; |
| 149 | 149 | ||
| 150 | dev_info(&bridge->dev, "PCI bridge, secondary bus %04x:%02x\n", | 150 | dev_info(&bridge->dev, "PCI bridge, secondary bus %04x:%02x\n", |