aboutsummaryrefslogtreecommitdiff
path: root/drivers/pnp/pnpacpi
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-04-28 16:33:59 -0600
committerLen Brown <len.brown@intel.com>2008-04-29 03:22:18 -0400
commitf7e8466a045c690002c1926e695ae312dd73bb4a (patch)
treef461d9e2d4961a2c55e254882caaee04d85ddb04 /drivers/pnp/pnpacpi
parent6bf2aab24a5dc26bf8274c4b9dbbed8ca99ae82c (diff)
PNPACPI: pnpacpi_encode_ext_irq() wrongly set "irq" instead of "extended_irq"
pnpacpi_encode_ext_irq() should set resource->data.extended_irq, not resource->data.irq. This has been wrong since at least 2.6.12. I haven't seen any bug reports, but it's clearly incorrect. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/pnpacpi')
-rw-r--r--drivers/pnp/pnpacpi/rsparser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 98cbc9f18ee..4ce754ab14f 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -820,9 +820,9 @@ static void pnpacpi_encode_ext_irq(struct acpi_resource *resource,
resource->data.extended_irq.triggering = triggering;
resource->data.extended_irq.polarity = polarity;
if (triggering == ACPI_EDGE_SENSITIVE)
- resource->data.irq.sharable = ACPI_EXCLUSIVE;
+ resource->data.extended_irq.sharable = ACPI_EXCLUSIVE;
else
- resource->data.irq.sharable = ACPI_SHARED;
+ resource->data.extended_irq.sharable = ACPI_SHARED;
resource->data.extended_irq.interrupt_count = 1;
resource->data.extended_irq.interrupts[0] = p->start;
}