diff options
| author | jkim <jkim@FreeBSD.org> | 2010-04-02 23:04:31 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-04-02 23:04:31 +0000 |
| commit | c22943d966183aab0b1bfca1f741ae7587c0002e (patch) | |
| tree | 6ff0f37946d2a209317eb79265f81066521bd4b8 /sys/dev/acpica/acpi_ec.c | |
| parent | bb4566312b32efc10475f0ef7b34bf3427a25225 (diff) | |
| download | FreeBSD-src-c22943d966183aab0b1bfca1f741ae7587c0002e.zip FreeBSD-src-c22943d966183aab0b1bfca1f741ae7587c0002e.tar.gz | |
Merge ACPICA 20100331 (and four additional upstream patches).
Diffstat (limited to 'sys/dev/acpica/acpi_ec.c')
| -rw-r--r-- | sys/dev/acpica/acpi_ec.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c index d4ef019..000658c 100644 --- a/sys/dev/acpica/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -518,14 +518,8 @@ acpi_ec_attach(device_t dev) } /* Enable runtime GPEs for the handler. */ - Status = AcpiSetGpeType(sc->ec_gpehandle, sc->ec_gpebit, - ACPI_GPE_TYPE_RUNTIME); - if (ACPI_FAILURE(Status)) { - device_printf(dev, "AcpiSetGpeType failed: %s\n", - AcpiFormatException(Status)); - goto error; - } - Status = AcpiEnableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_NOT_ISR); + Status = AcpiEnableGpe(sc->ec_gpehandle, sc->ec_gpebit, + ACPI_GPE_TYPE_RUNTIME); if (ACPI_FAILURE(Status)) { device_printf(dev, "AcpiEnableGpe failed: %s\n", AcpiFormatException(Status)); @@ -575,7 +569,7 @@ acpi_ec_shutdown(device_t dev) /* Disable the GPE so we don't get EC events during shutdown. */ sc = device_get_softc(dev); - AcpiDisableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_NOT_ISR); + AcpiDisableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_GPE_TYPE_RUNTIME); return (0); } |
