1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index d708358326e5..e1c079aa0e82 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -84,6 +84,7 @@ int pci_bus_add_device(struct pci_dev *dev)
         if (retval)
                 return retval;
 
+        dev->is_added = 1;
         down_write(&pci_bus_sem);
         list_add_tail(&dev->global_list, &pci_devices);
         up_write(&pci_bus_sem);
@@ -112,11 +113,8 @@ void pci_bus_add_devices(struct pci_bus *bus)
         int retval;
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
-                /*
-                 * Skip already-present devices (which are on the
-                 * global device list.)
-                 */
-                if (!list_empty(&dev->global_list))
+                /* Skip already-added devices */
+                if (dev->is_added)
                         continue;
                 retval = pci_bus_add_device(dev);
                 if (retval)
@@ -124,8 +122,7 @@ void pci_bus_add_devices(struct pci_bus *bus)
         }
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
-
-                BUG_ON(list_empty(&dev->global_list));
+                BUG_ON(!dev->is_added);
 
                 /*
                  * If there is an unattached subordinate bus, attach