From 72e5c68e69585e94f096f684053ed7f87fee70c3 Mon Sep 17 00:00:00 2001 From: Aaron Lu Date: Mon, 31 Dec 2012 00:07:01 +0000 Subject: [PATCH] --- yaml --- r: 350891 b: refs/heads/master c: e3ab8e42ffe03418c199ea92a6f8bbb5f1e345c7 h: refs/heads/master i: 350889: cd49861cfaa5c745001814f98a1b47b8d6386758 350887: e37f395af0cd1a0abe7f9c1087d6d6f2f9671512 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/rsirq.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e9cb3cfe9f0e..b59a2c4c3e1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78d025e2d057a3490f918a6e3ebe2486236505cf +refs/heads/master: e3ab8e42ffe03418c199ea92a6f8bbb5f1e345c7 diff --git a/trunk/drivers/acpi/acpica/rsirq.c b/trunk/drivers/acpi/acpica/rsirq.c index a718eca8e825..14cb76e03e14 100644 --- a/trunk/drivers/acpi/acpica/rsirq.c +++ b/trunk/drivers/acpi/acpica/rsirq.c @@ -80,7 +80,7 @@ struct acpi_rsconvert_info acpi_rs_get_irq[8] = { {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_AML_LENGTH, 0, 3}, - /* Get flags: Triggering[0], Polarity[3], Sharing[4] */ + /* Get flags: Triggering[0], Polarity[3], sharing_and_wake[4:5] */ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.triggering), AML_OFFSET(irq.flags), @@ -90,7 +90,7 @@ struct acpi_rsconvert_info acpi_rs_get_irq[8] = { AML_OFFSET(irq.flags), 3}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable), + {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.irq.sharable), AML_OFFSET(irq.flags), 4} }; @@ -114,7 +114,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[13] = { AML_OFFSET(irq.irq_mask), ACPI_RS_OFFSET(data.irq.interrupt_count)}, - /* Set the flags byte */ + /* Set flags: Triggering[0], Polarity[3], sharing_and_wake[4:5] */ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.triggering), AML_OFFSET(irq.flags), @@ -124,7 +124,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[13] = { AML_OFFSET(irq.flags), 3}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable), + {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.irq.sharable), AML_OFFSET(irq.flags), 4},