1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 52b54f053be0..68f91a252595 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -133,7 +133,7 @@ int pci_bus_add_child(struct pci_bus *bus)
  *
  * Call hotplug for each new devices.
  */
-void pci_bus_add_devices(struct pci_bus *bus)
+void pci_bus_add_devices(const struct pci_bus *bus)
 {
         struct pci_dev *dev;
         struct pci_bus *child;
@@ -184,8 +184,10 @@ void pci_enable_bridges(struct pci_bus *bus)
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
                 if (dev->subordinate) {
-                        retval = pci_enable_device(dev);
-                        pci_set_master(dev);
+                        if (atomic_read(&dev->enable_cnt) == 0) {
+                                retval = pci_enable_device(dev);
+                                pci_set_master(dev);
+                        }
                         pci_enable_bridges(dev->subordinate);
                 }
         }