From eb1fa36308e567877dea0baf2ffc23a668b26ab4 Mon Sep 17 00:00:00 2001
From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com>
Date: Thu, 3 Jan 2013 10:37:45 +0800
Subject: [PATCH] --- yaml --- r: 360563 b: refs/heads/master c:
 f24c96eae58aeea4c36fb064cf3ee9734933f8fc h: refs/heads/master i:   360561:
 1fdd5df7ffb1b20bb4b247c62844125dbb7fa246   360559:
 24f1c7979fa607087c273b8f336a9233efe9d8e6 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/platform/x86/acer-wmi.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fb2e21b76f60..1162f9cfe024 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f62bc3e8d2410b538bde9677552270055f8595a
+refs/heads/master: f24c96eae58aeea4c36fb064cf3ee9734933f8fc
diff --git a/trunk/drivers/platform/x86/acer-wmi.c b/trunk/drivers/platform/x86/acer-wmi.c
index 563dc3f0e3e7..c9076bdaf2c1 100644
--- a/trunk/drivers/platform/x86/acer-wmi.c
+++ b/trunk/drivers/platform/x86/acer-wmi.c
@@ -1222,6 +1222,9 @@ static acpi_status WMID_set_capabilities(void)
 			devices = *((u32 *) obj->buffer.pointer);
 		} else if (obj->type == ACPI_TYPE_INTEGER) {
 			devices = (u32) obj->integer.value;
+		} else {
+			kfree(out.pointer);
+			return AE_ERROR;
 		}
 	} else {
 		kfree(out.pointer);