From b71061ec9584cc17de1728014f842cc40b4b1e78 Mon Sep 17 00:00:00 2001 From: Alexey Starikovskiy Date: Thu, 7 Dec 2006 18:42:17 +0300 Subject: [PATCH] --- yaml --- r: 44942 b: refs/heads/master c: 523953b41e52952347d7d50dcc4bfc27bc001dc8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/ec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8e9528cd4d7d..1f4bf40053e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50c1e1138cb94f6aca0f8555777edbcefe0324e2 +refs/heads/master: 523953b41e52952347d7d50dcc4bfc27bc001dc8 diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c index 8ef74e7b3b91..4d17777110ed 100644 --- a/trunk/drivers/acpi/ec.c +++ b/trunk/drivers/acpi/ec.c @@ -286,12 +286,12 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command, if (rdata) memset(rdata, 0, rdata_len); + mutex_lock(&ec->lock); if (ec->global_lock) { status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk); if (ACPI_FAILURE(status)) return -ENODEV; } - mutex_lock(&ec->lock); /* Make sure GPE is enabled before doing transaction */ acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR); @@ -307,10 +307,10 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command, rdata, rdata_len); end: - mutex_unlock(&ec->lock); if (ec->global_lock) acpi_release_global_lock(glk); + mutex_unlock(&ec->lock); return status; }