Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / pci / bus.c

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 68f91a25259563c6bb7250d8ea3acfd636ad0b29..97a8194063b5d66fd754680a5c94323bec456c8c 100644 (file)
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -184,7 +184,7 @@ void pci_enable_bridges(struct pci_bus *bus)
 
        list_for_each_entry(dev, &bus->devices, bus_list) {
                if (dev->subordinate) {
-                       if (atomic_read(&dev->enable_cnt) == 0) {
+                       if (!pci_is_enabled(dev)) {
                                retval = pci_enable_device(dev);
                                pci_set_master(dev);
                        }