---

yaml --- r: 360563 b: refs/heads/master c: f24c96e h: refs/heads/master i: 360561: 1fdd5df 360559: 24f1c79 v: v3
git-mirror · Feb 27, 2013 · eb1fa36 · eb1fa36
1 parent 788511e
commit eb1fa36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);