Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

[linux-2.6] / drivers / pci / hotplug / shpchprm_acpi.c

diff --git a/drivers/pci/hotplug/shpchprm_acpi.c b/drivers/pci/hotplug/shpchprm_acpi.c
index 243a51d88b86844d75a7f2e84c7e3522c837a066..7957cdc72cd0464869096ffe9b59298953fdc539 100644 (file)
--- a/drivers/pci/hotplug/shpchprm_acpi.c
+++ b/drivers/pci/hotplug/shpchprm_acpi.c
@@ -1626,7 +1626,7 @@ int shpchprm_set_hpp(
        pci_bus->number = func->bus;
        devfn = PCI_DEVFN(func->device, func->function);
 
-       ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->bus);
+       ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->slot_bus);
 
        if (ab) {
                if (ab->_hpp) {
@@ -1681,7 +1681,7 @@ void shpchprm_enable_card(
                | PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
        bcmd = bcommand  = bcommand | PCI_BRIDGE_CTL_NO_ISA;
 
-       ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->bus);
+       ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->slot_bus);
        if (ab) {
                if (ab->_hpp) {
                        if (ab->_hpp->enable_perr) {