From af0c5620f2349e01a6a01c1dce79cb7dd6d3a038 Mon Sep 17 00:00:00 2001 From: Alexander Polakov Date: Mon, 16 Nov 2009 22:12:14 +0300 Subject: [PATCH] Attempt to fix "ACPI Warning: Cannot release the ACPI Global Lock" Reported-by: Edward O'Callaghan --- sys/dev/acpica5/acpi_ec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/acpica5/acpi_ec.c b/sys/dev/acpica5/acpi_ec.c index b2dc22c8e4..107e8efcd4 100644 --- a/sys/dev/acpica5/acpi_ec.c +++ b/sys/dev/acpica5/acpi_ec.c @@ -199,23 +199,23 @@ EcLock(struct acpi_ec_softc *sc) { ACPI_STATUS status; + ACPI_SERIAL_BEGIN(ec); /* If _GLK is non-zero, acquire the global lock. */ status = AE_OK; if (sc->ec_glk) { status = AcpiAcquireGlobalLock(EC_LOCK_TIMEOUT, &sc->ec_glkhandle); if (ACPI_FAILURE(status)) - return (status); + ACPI_SERIAL_END(ec); } - ACPI_SERIAL_BEGIN(ec); return (status); } static void EcUnlock(struct acpi_ec_softc *sc) { - ACPI_SERIAL_END(ec); if (sc->ec_glk) AcpiReleaseGlobalLock(sc->ec_glkhandle); + ACPI_SERIAL_END(ec); } static uint32_t EcGpeHandler(void *Context); -- 2.41.0