Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

[sfrench/cifs-2.6.git] / drivers / pci / hotplug / pciehprm_acpi.c

diff --git a/drivers/pci/hotplug/pciehprm_acpi.c b/drivers/pci/hotplug/pciehprm_acpi.c
index 305b47ec2f2cde3a8d796a0860b8793bce29f446..1406db35b08967f40bfb1c03625a412c68b98263 100644 (file)
--- a/drivers/pci/hotplug/pciehprm_acpi.c
+++ b/drivers/pci/hotplug/pciehprm_acpi.c
@@ -1696,15 +1696,15 @@ void pciehprm_enable_card(
        pci_bus->number = func->bus;
        devfn = PCI_DEVFN(func->device, func->function);
 
-       rc = pci_bus_read_config_word(pci_bus, devfn, PCI_COMMAND, &command);
+       rc = pci_bus_read_config_word(pci_bus, devfn, PCI_COMMAND, &cmd);
 
        if (card_type == PCI_HEADER_TYPE_BRIDGE) {
-               rc = pci_bus_read_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, &bcommand);
+               rc = pci_bus_read_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, &bcmd);
        }
 
-       cmd = command  = command | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE
+       command  = cmd | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE
                | PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
-       bcmd = bcommand  = bcommand | PCI_BRIDGE_CTL_NO_ISA;
+       bcommand  = bcmd | PCI_BRIDGE_CTL_NO_ISA;
 
        ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->bus);
        if (ab) {