From 17cd5d20b3c49d470983efd4435fc26796cf302b Mon Sep 17 00:00:00 2001 From: Rajesh Shah Date: Tue, 16 Aug 2005 17:32:04 -0700 Subject: [PATCH] --- yaml --- r: 8291 b: refs/heads/master c: 7c56075e60caaff1314decdb61b72ef576915270 h: refs/heads/master i: 8289: f07b434bc0994b7549624ffb3e4368bcd2b7f750 8287: f8687596e9c0163fd3c35641d3dadb3c80cee014 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/pciehprm_acpi.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a3de9994f13e..4af898504da3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 144a50ea5e1487b8b8e722289b4177713354448a +refs/heads/master: 7c56075e60caaff1314decdb61b72ef576915270 diff --git a/trunk/drivers/pci/hotplug/pciehprm_acpi.c b/trunk/drivers/pci/hotplug/pciehprm_acpi.c index 305b47ec2f2c..1406db35b089 100644 --- a/trunk/drivers/pci/hotplug/pciehprm_acpi.c +++ b/trunk/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) {