ACPI: ec: Acquire Global Lock under EC mutex.

Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 8ef74e7b3b9137259bce8c3dda7b747540d12848..4d17777110edbf7f16a0871d096ec2e0895409f5 100644 (file)
--- 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);
 
         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;
        }
        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);
 
        /* 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:
                                               rdata, rdata_len);
 
 end:

-       mutex_unlock(&ec->lock);

 
        if (ec->global_lock)
                acpi_release_global_lock(glk);
 
        if (ec->global_lock)
                acpi_release_global_lock(glk);

+       mutex_unlock(&ec->lock);

 
        return status;
 }
 
        return status;
 }