diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:37:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:37:10 -0800 |
| commit | 12f981f9028da2402c236544c78b8378a278f830 (patch) | |
| tree | 7983fdf95d77ad241e09db861bb90a629eee753f /drivers/pci/bus.c | |
| parent | 10955d2251387df3997d8b9b6c572dfad9f23dd0 (diff) | |
| parent | c1ef5cbd03921047c2eafb998132e562043678a7 (diff) | |
| download | linux-12f981f9028da2402c236544c78b8378a278f830.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
pci: hotplug: pciehp: fix error code path in hpc_power_off_slot
PCI: Add DECLARE_PCI_DEVICE_TABLE macro
PCI: fix up error messages for pci_bus registering
PCI: fix section mismatch warning in pci_scan_child_bus
PCI: consolidate duplicated MSI enable functions
PCI: use dev_printk in quirk messages
Diffstat (limited to 'drivers/pci/bus.c')
| -rw-r--r-- | drivers/pci/bus.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index ef5a6a245f5f..6a9403d79e0c 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -145,13 +145,15 @@ void pci_bus_add_devices(struct pci_bus *bus) child_bus = dev->subordinate; child_bus->dev.parent = child_bus->bridge; retval = device_register(&child_bus->dev); - if (!retval) + if (retval) + dev_err(&dev->dev, "Error registering pci_bus," + " continuing...\n"); + else retval = device_create_file(&child_bus->dev, &dev_attr_cpuaffinity); if (retval) - dev_err(&dev->dev, "Error registering pci_bus" - " device bridge symlink," - " continuing...\n"); + dev_err(&dev->dev, "Error creating cpuaffinity" + " file, continuing...\n"); } } } |