summaryrefslogtreecommitdiffstats
path: root/drivers/pci/bus.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-04-17 10:31:34 -0600
committerBjorn Helgaas <bhelgaas@google.com>2013-04-17 10:31:34 -0600
commit723ec4d06cb2eed481436cfe008f5f63c45e88fd (patch)
treee59112af8616e8fbc0cc6c2219b49fd2f05bfc41 /drivers/pci/bus.c
parenta3b6bbd5774c13dab89d72f79976ba762913b2f2 (diff)
parentf39d5b72913e2a9ff00ba5ab145ee05a888b1286 (diff)
downloadop-kernel-dev-723ec4d06cb2eed481436cfe008f5f63c45e88fd.zip
op-kernel-dev-723ec4d06cb2eed481436cfe008f5f63c45e88fd.tar.gz
Merge branch 'pci/cleanup' into next
* pci/cleanup: PCI: Remove "extern" from function declarations PCI: Warn about failures instead of "must_check" functions PCI: Remove __must_check from definitions PCI: Remove unused variables PCI: Move cpci_hotplug_init() proto to header file PCI: Make local functions/structs static PCI: Fix missing prototype for pcie_port_acpi_setup() Conflicts: drivers/pci/hotplug/acpiphp.h include/linux/pci.h
Diffstat (limited to 'drivers/pci/bus.c')
-rw-r--r--drivers/pci/bus.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index bdc1e8b..748f8f3 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -202,6 +202,9 @@ void pci_bus_add_devices(const struct pci_bus *bus)
if (dev->is_added)
continue;
retval = pci_bus_add_device(dev);
+ if (retval)
+ dev_err(&dev->dev, "Error adding device (%d)\n",
+ retval);
}
list_for_each_entry(dev, &bus->devices, bus_list) {
OpenPOWER on IntegriCloud