git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-ixp2000
/
ixdp2800.c
diff --git
a/arch/arm/mach-ixp2000/ixdp2800.c
b/arch/arm/mach-ixp2000/ixdp2800.c
index
91d36d9
..
70d247f
100644
(file)
--- a/
arch/arm/mach-ixp2000/ixdp2800.c
+++ b/
arch/arm/mach-ixp2000/ixdp2800.c
@@
-261,14
+261,16
@@
int __init ixdp2800_pci_init(void)
pci_common_init(&ixdp2800_pci);
if (ixdp2x00_master_npu()) {
pci_common_init(&ixdp2800_pci);
if (ixdp2x00_master_npu()) {
- dev = pci_
fi
nd_slot(1, IXDP2800_SLAVE_ENET_DEVFN);
+ dev = pci_
get_bus_a
nd_slot(1, IXDP2800_SLAVE_ENET_DEVFN);
pci_remove_bus_device(dev);
pci_remove_bus_device(dev);
+ pci_dev_put(dev);
ixdp2800_master_enable_slave();
ixdp2800_master_wait_for_slave_bus_scan();
} else {
ixdp2800_master_enable_slave();
ixdp2800_master_wait_for_slave_bus_scan();
} else {
- dev = pci_
fi
nd_slot(1, IXDP2800_MASTER_ENET_DEVFN);
+ dev = pci_
get_bus_a
nd_slot(1, IXDP2800_MASTER_ENET_DEVFN);
pci_remove_bus_device(dev);
pci_remove_bus_device(dev);
+ pci_dev_put(dev);
}
}
}
}