2 files changed, 6 insertions, 1 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 6a9403d79e0c..d708358326e5 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -143,14 +143,18 @@ void pci_bus_add_devices(struct pci_bus *bus)
                         /* register the bus with sysfs as the parent is now
                          * properly registered. */
                         child_bus = dev->subordinate;
+                        if (child_bus->is_added)
+                                continue;
                         child_bus->dev.parent = child_bus->bridge;
                         retval = device_register(&child_bus->dev);
                         if (retval)
                                 dev_err(&dev->dev, "Error registering pci_bus,"
                                         " continuing...\n");
-                        else
+                        else {
+                                child_bus->is_added = 1;
                                 retval = device_create_file(&child_bus->dev,
                                                         &dev_attr_cpuaffinity);
+                        }
                         if (retval)
                                 dev_err(&dev->dev, "Error creating cpuaffinity"
                                         " file, continuing...\n");
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 38eff1947750..9010f5458767 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -278,6 +278,7 @@ struct pci_bus {
         struct device           dev;
         struct bin_attribute    *legacy_io; /* legacy I/O for this bus */
         struct bin_attribute    *legacy_mem; /* legacy mem */
+        unsigned int            is_added:1;
 };
 
 #define pci_bus_b(n)    list_entry(n, struct pci_bus, node)