diff options
| author | Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> | 2006-12-07 18:42:17 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-08 10:56:07 +0300 |
| commit | 523953b41e52952347d7d50dcc4bfc27bc001dc8 (patch) | |
| tree | 655fd4ac231a8502651cbb216886d5f3ac404ba0 /drivers/acpi/ec.c | |
| parent | 50c1e1138cb94f6aca0f8555777edbcefe0324e2 (diff) | |
| download | linux-523953b41e52952347d7d50dcc4bfc27bc001dc8.tar.xz | |
ACPI: ec: Acquire Global Lock under EC mutex.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 8ef74e7b3b91..4d17777110ed 100644 --- a/drivers/acpi/ec.c +++ b/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; } |