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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
shpchprm_acpi.c
diff --git
a/drivers/pci/hotplug/shpchprm_acpi.c
b/drivers/pci/hotplug/shpchprm_acpi.c
index
6ea1703
..
f1c51f0
100644
(file)
--- a/
drivers/pci/hotplug/shpchprm_acpi.c
+++ b/
drivers/pci/hotplug/shpchprm_acpi.c
@@
-1396,17
+1396,19
@@
static int configure_existing_function(
static int bind_pci_resources_to_slots ( struct controller *ctrl)
{
struct pci_func *func, new_func;
static int bind_pci_resources_to_slots ( struct controller *ctrl)
{
struct pci_func *func, new_func;
- int busn = ctrl->bus;
+ int busn = ctrl->
slot_
bus;
int devn, funn;
u32 vid;
for (devn = 0; devn < 32; devn++) {
for (funn = 0; funn < 8; funn++) {
int devn, funn;
u32 vid;
for (devn = 0; devn < 32; devn++) {
for (funn = 0; funn < 8; funn++) {
+ /*
if (devn == ctrl->device && funn == ctrl->function)
continue;
if (devn == ctrl->device && funn == ctrl->function)
continue;
+ */
/* find out if this entry is for an occupied slot */
vid = 0xFFFFFFFF;
/* find out if this entry is for an occupied slot */
vid = 0xFFFFFFFF;
- pci_bus_read_config_dword(ctrl->pci_
bus
, PCI_DEVFN(devn, funn), PCI_VENDOR_ID, &vid);
+ pci_bus_read_config_dword(ctrl->pci_
dev->subordinate
, PCI_DEVFN(devn, funn), PCI_VENDOR_ID, &vid);
if (vid != 0xFFFFFFFF) {
func = shpchp_slot_find(busn, devn, funn);
if (vid != 0xFFFFFFFF) {
func = shpchp_slot_find(busn, devn, funn);