From 2f4476ff2bdda89b15b9504243fb6df8b397319b Mon Sep 17 00:00:00 2001 From: Kristen Accardi Date: Wed, 2 Nov 2005 16:24:35 -0800 Subject: [PATCH] --- yaml --- r: 17481 b: refs/heads/master c: 8015a01486a0f789c9e98e8bf1f12a3ccb535b30 h: refs/heads/master i: 17479: c9e39b92f0422a85a61859170a0b2c5e730b4c8a v: v3 --- [refs] | 2 +- trunk/drivers/acpi/pci_irq.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4eee9cba7c92..ba12e4acee40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffeff788d6b10e342b4a887f28d339dfec1737f6 +refs/heads/master: 8015a01486a0f789c9e98e8bf1f12a3ccb535b30 diff --git a/trunk/drivers/acpi/pci_irq.c b/trunk/drivers/acpi/pci_irq.c index 09567c2edcfb..e567c03b238e 100644 --- a/trunk/drivers/acpi/pci_irq.c +++ b/trunk/drivers/acpi/pci_irq.c @@ -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", @@ -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", @@ -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--;