diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-06 22:37:32 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-06 22:37:32 +0100 |
| commit | 72e1e868ca8f14ef34c95e0e8b73f64b6acf5934 (patch) | |
| tree | d3bc99f121693ab8f09c03ea555254c9314ff98d /drivers/pci/bus.c | |
| parent | Merge branch 'pci/huang-d3cold-fixes' into next (diff) | |
| parent | x86: Use PCI setup data (diff) | |
| download | linux-72e1e868ca8f14ef34c95e0e8b73f64b6acf5934.tar.xz linux-72e1e868ca8f14ef34c95e0e8b73f64b6acf5934.zip | |
Merge branch 'pci/mjg-pci-roms-from-efi' into next
* pci/mjg-pci-roms-from-efi:
x86: Use PCI setup data
PCI: Add support for non-BAR ROMs
PCI: Add pcibios_add_device
EFI: Stash ROMs if they're not in the PCI BAR
Diffstat (limited to 'drivers/pci/bus.c')
| -rw-r--r-- | drivers/pci/bus.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index a543746fb354..ad6a8b635692 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -170,6 +170,11 @@ int pci_bus_add_device(struct pci_dev *dev) int retval; pci_fixup_device(pci_fixup_final, dev); + + retval = pcibios_add_device(dev); + if (retval) + return retval; + retval = device_add(&dev->dev); if (retval) return retval; |