aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/bus.c3
-rw-r--r--drivers/pci/setup-bus.c2
-rw-r--r--drivers/pci/slot.c7
3 files changed, 10 insertions, 2 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 8647dc6f52d0..ee4c4c4fde17 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)
202 if (dev->is_added) 202 if (dev->is_added)
203 continue; 203 continue;
204 retval = pci_bus_add_device(dev); 204 retval = pci_bus_add_device(dev);
205 if (retval)
206 dev_err(&dev->dev, "Error adding device (%d)\n",
207 retval);
205 } 208 }
206 209
207 list_for_each_entry(dev, &bus->devices, bus_list) { 210 list_for_each_entry(dev, &bus->devices, bus_list) {
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 502a75ea12fb..16abaaa1f83c 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1545,6 +1545,8 @@ again:
1545 1545
1546enable_all: 1546enable_all:
1547 retval = pci_reenable_device(bridge); 1547 retval = pci_reenable_device(bridge);
1548 if (retval)
1549 dev_err(&bridge->dev, "Error reenabling bridge (%d)\n", retval);
1548 pci_set_master(bridge); 1550 pci_set_master(bridge);
1549 pci_enable_bridges(parent); 1551 pci_enable_bridges(parent);
1550} 1552}
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index ac6412fb8d6f..c1e9284a677b 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -377,14 +377,17 @@ void pci_hp_create_module_link(struct pci_slot *pci_slot)
377{ 377{
378 struct hotplug_slot *slot = pci_slot->hotplug; 378 struct hotplug_slot *slot = pci_slot->hotplug;
379 struct kobject *kobj = NULL; 379 struct kobject *kobj = NULL;
380 int no_warn; 380 int ret;
381 381
382 if (!slot || !slot->ops) 382 if (!slot || !slot->ops)
383 return; 383 return;
384 kobj = kset_find_obj(module_kset, slot->ops->mod_name); 384 kobj = kset_find_obj(module_kset, slot->ops->mod_name);
385 if (!kobj) 385 if (!kobj)
386 return; 386 return;
387 no_warn = sysfs_create_link(&pci_slot->kobj, kobj, "module"); 387 ret = sysfs_create_link(&pci_slot->kobj, kobj, "module");
388 if (ret)
389 dev_err(&pci_slot->bus->dev, "Error creating sysfs link (%d)\n",
390 ret);
388 kobject_put(kobj); 391 kobject_put(kobj);
389} 392}
390EXPORT_SYMBOL_GPL(pci_hp_create_module_link); 393EXPORT_SYMBOL_GPL(pci_hp_create_module_link);