From 1c54cd9c42173bd55e5aa91e66e401ab7b9d7fa8 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Wed, 19 Dec 2012 05:37:47 +0000
Subject: [PATCH] --- yaml --- r: 350863 b: refs/heads/master c:
 227158211e8eba104a477c9a263797256811f206 h: refs/heads/master i:   350861:
 5ce1763db4039e16c1aebf763c7003abb24066d8   350859:
 85bf71093ec4f72129efbe3c6faa774d78d7c7e3   350855:
 8ae79d63bcf7c218cb0991efd0b8f52f97339108   350847:
 21bf59e79be77a698fa3262de647afe8509b7e96 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/acpi/acpica/dsmethod.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 98fe6af17956..a63d56d4c07b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e444606d88b877dfb1a57b0a0ae81ed5320922
+refs/heads/master: 227158211e8eba104a477c9a263797256811f206
diff --git a/trunk/drivers/acpi/acpica/dsmethod.c b/trunk/drivers/acpi/acpica/dsmethod.c
index 735c05996ec6..54c968ab8144 100644
--- a/trunk/drivers/acpi/acpica/dsmethod.c
+++ b/trunk/drivers/acpi/acpica/dsmethod.c
@@ -378,7 +378,8 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
 	 */
 	info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));
 	if (!info) {
-		return_ACPI_STATUS(AE_NO_MEMORY);
+		status = AE_NO_MEMORY;
+		goto cleanup;
 	}
 
 	info->parameters = &this_walk_state->operands[0];