From ff8e388b205339d10e6feee3604374a50cea57d9 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 12 Apr 2013 11:35:40 -0600
Subject: [PATCH] --- yaml --- r: 362892 b: refs/heads/master c:
 9fc9eea09f518b9bbdc0a14ef668698c913ba614 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pci/bus.c       | 3 +++
 trunk/drivers/pci/setup-bus.c | 2 ++
 trunk/drivers/pci/slot.c      | 7 +++++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1d604c837b69..03cd871413f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d67aed63b8bfa4a06575ed578328b02f909699ee
+refs/heads/master: 9fc9eea09f518b9bbdc0a14ef668698c913ba614
diff --git a/trunk/drivers/pci/bus.c b/trunk/drivers/pci/bus.c
index 8647dc6f52d0..ee4c4c4fde17 100644
--- a/trunk/drivers/pci/bus.c
+++ b/trunk/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) {
diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c
index 502a75ea12fb..16abaaa1f83c 100644
--- a/trunk/drivers/pci/setup-bus.c
+++ b/trunk/drivers/pci/setup-bus.c
@@ -1545,6 +1545,8 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
 
 enable_all:
 	retval = pci_reenable_device(bridge);
+	if (retval)
+		dev_err(&bridge->dev, "Error reenabling bridge (%d)\n", retval);
 	pci_set_master(bridge);
 	pci_enable_bridges(parent);
 }
diff --git a/trunk/drivers/pci/slot.c b/trunk/drivers/pci/slot.c
index ac6412fb8d6f..c1e9284a677b 100644
--- a/trunk/drivers/pci/slot.c
+++ b/trunk/drivers/pci/slot.c
@@ -377,14 +377,17 @@ void pci_hp_create_module_link(struct pci_slot *pci_slot)
 {
 	struct hotplug_slot *slot = pci_slot->hotplug;
 	struct kobject *kobj = NULL;
-	int no_warn;
+	int ret;
 
 	if (!slot || !slot->ops)
 		return;
 	kobj = kset_find_obj(module_kset, slot->ops->mod_name);
 	if (!kobj)
 		return;
-	no_warn = sysfs_create_link(&pci_slot->kobj, kobj, "module");
+	ret = sysfs_create_link(&pci_slot->kobj, kobj, "module");
+	if (ret)
+		dev_err(&pci_slot->bus->dev, "Error creating sysfs link (%d)\n",
+			ret);
 	kobject_put(kobj);
 }
 EXPORT_SYMBOL_GPL(pci_hp_create_module_link);