projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
pci
/
bus.c
diff --git
a/drivers/pci/bus.c
b/drivers/pci/bus.c
index
68f91a2
..
97a8194
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);
}