diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-09 20:56:54 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-09 20:56:54 -0600 |
| commit | 9349b44a459677e270ae19a373c58e5c3edbff04 (patch) | |
| tree | 630d4e337691b959b663b79060360fb725a8396a /drivers/pci/bus.c | |
| parent | a7711ba1090a5fa1caa6e07182ac4e8e1c0da695 (diff) | |
| parent | 735bff10c157fdbba2291e10ca3e28a59c7acc1c (diff) | |
| download | linux-rt-9349b44a459677e270ae19a373c58e5c3edbff04.tar.gz | |
Merge branch 'pci/myron-final-fixups-v2' into next
* pci/myron-final-fixups-v2:
PCI: call final fixups hot-added devices
PCI: move final fixups from __init to __devinit
x86/PCI: move final fixups from __init to __devinit
MIPS/PCI: move final fixups from __init to __devinit
PCI: never discard enable/suspend/resume_early/resume fixups
PCI: release temporary reference in __nv_msi_ht_cap_quirk()
PCI: restructure 'pci_do_fixups()'
Diffstat (limited to 'drivers/pci/bus.c')
| -rw-r--r-- | drivers/pci/bus.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 4ce5ef2f2826..b511bd4e3f7c 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -164,6 +164,10 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, int pci_bus_add_device(struct pci_dev *dev) { int retval; + extern bool pci_fixup_final_inited; + + if (pci_fixup_final_inited) + pci_fixup_device(pci_fixup_final, dev); retval = device_add(&dev->dev); if (retval) return retval; |