commit 523953b41e52952347d7d50dcc4bfc27bc001dc8
author Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> Thu Dec 07 18:42:17 2006 +0300
committer Len Brown <len.brown@intel.com> Fri Dec 08 02:56:07 2006 -0500
tree 655fd4ac231a8502651cbb216886d5f3ac404ba0
parent 50c1e1138cb94f6aca0f8555777edbcefe0324e2

ACPI: ec: Acquire Global Lock under EC mutex.

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

drivers/acpi/ec.c

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 8ef74e7..4d17777 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -286,12 +286,12 @@
         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 @@
                                               rdata, rdata_len);
 
 end:
-	mutex_unlock(&ec->lock);
 
 	if (ec->global_lock)
 		acpi_release_global_lock(glk);
+	mutex_unlock(&ec->lock);
 
 	return status;
 }