aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-03-03 14:47:13 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-03-04 15:07:03 -0800
commit4725e7bdb831b9d4bd4ba0b0909398ebcf0c2df9 (patch)
tree1b1e9cd754a7330d35636d746631ae0fd4adbb7a /drivers
parentPCI: fix section mismatch warning in pci_scan_child_bus (diff)
downloadlinux-dev-4725e7bdb831b9d4bd4ba0b0909398ebcf0c2df9.tar.xz
linux-dev-4725e7bdb831b9d4bd4ba0b0909398ebcf0c2df9.zip
PCI: fix up error messages for pci_bus registering
Due to the class_device cleanup of pci_bus, the error messages when things go wrong are incorrect. So fix this up to properly report what is really happening, if things go wrong. Thanks to Kay for pointing out the issue. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/bus.c10
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");
}
}
}