瀏覽代碼

Merge branch 'acpi-ec'

* acpi-ec:
  ACPI / EC: Ensure lock is acquired before accessing ec struct members
Rafael J. Wysocki 11 年之前
父節點
當前提交
dcaea2c18e
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/acpi/ec.c

+ 2 - 1
drivers/acpi/ec.c

@@ -173,9 +173,10 @@ static void start_transaction(struct acpi_ec *ec)
 static void advance_transaction(struct acpi_ec *ec, u8 status)
 static void advance_transaction(struct acpi_ec *ec, u8 status)
 {
 {
 	unsigned long flags;
 	unsigned long flags;
-	struct transaction *t = ec->curr;
+	struct transaction *t;
 
 
 	spin_lock_irqsave(&ec->lock, flags);
 	spin_lock_irqsave(&ec->lock, flags);
+	t = ec->curr;
 	if (!t)
 	if (!t)
 		goto unlock;
 		goto unlock;
 	if (t->wlen > t->wi) {
 	if (t->wlen > t->wi) {