Skip to content

Commit

Permalink
[PATCH] apci: use pin stored in pci_dev
Browse files Browse the repository at this point in the history
Use the stored value of the Interrupt Pin, rather than try to read
it again.

Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Kristen Accardi authored and Greg Kroah-Hartman committed Jan 9, 2006
1 parent ffeff78 commit 8015a01
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/acpi/pci_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,7 @@ acpi_pci_irq_derive(struct pci_dev *dev,

if ((bridge->class >> 8) == PCI_CLASS_BRIDGE_CARDBUS) {
/* PC card has the same IRQ as its cardbridge */
pci_read_config_byte(bridge, PCI_INTERRUPT_PIN,
&bridge_pin);
bridge_pin = bridge->pin;
if (!bridge_pin) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"No interrupt pin configured for device %s\n",
Expand Down Expand Up @@ -412,7 +411,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
if (!dev)
return_VALUE(-EINVAL);

pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
pin = dev->pin;
if (!pin) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"No interrupt pin configured for device %s\n",
Expand Down Expand Up @@ -503,7 +502,7 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
if (!dev || !dev->bus)
return_VOID;

pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
pin = dev->pin;
if (!pin)
return_VOID;
pin--;
Expand Down

0 comments on commit 8015a01

Please sign in to comment.