---

yaml --- r: 336650 b: refs/heads/master c: bee6dc3 h: refs/heads/master v: v3
git-mirror · Nov 14, 2012 · 3fdb29d · 3fdb29d
1 parent 67f80ea
commit 3fdb29d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abf95c362929ce0af7dd413f981597c5386f749d
+refs/heads/master: bee6dc39cfa4be083e8c11cee0867eb7dc56895b
diff --git a/trunk/drivers/acpi/acpica/rscalc.c b/trunk/drivers/acpi/acpica/rscalc.c
@@ -457,6 +457,15 @@ acpi_rs_get_list_length(u8 * aml_buffer,
 			 * Get the number of vendor data bytes
 			 */
 			extra_struct_bytes = resource_length;
+
+			/*
+			 * There is already one byte included in the minimum
+			 * descriptor size. If there are extra struct bytes,
+			 * subtract one from the count.
+			 */
+			if (extra_struct_bytes) {
+				extra_struct_bytes--;
+			}
 			break;
 
 		case ACPI_RESOURCE_NAME_END_TAG: