diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 15:17:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 15:17:00 -0700 |
| commit | 41d0ab2a7dfe9e25504169c98eac5e84e5509e3d (patch) | |
| tree | cb4e957b0c03494f4e0cc6a3f0f468e4b608dbf1 /drivers/pci/hotplug | |
| parent | a4531edd75522804dd2b268d8ccc5eaa70748011 (diff) | |
| parent | cdb9b9f730eac4f947a2c552806a3a550bf019ef (diff) | |
| download | kernel_samsung_aries-41d0ab2a7dfe9e25504169c98eac5e84e5509e3d.zip kernel_samsung_aries-41d0ab2a7dfe9e25504169c98eac5e84e5509e3d.tar.gz kernel_samsung_aries-41d0ab2a7dfe9e25504169c98eac5e84e5509e3d.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/pci/hotplug')
| -rw-r--r-- | drivers/pci/hotplug/pciehprm_acpi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/pciehprm_acpi.c b/drivers/pci/hotplug/pciehprm_acpi.c index 305b47e..1406db3 100644 --- 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) { |