summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-14 12:44:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-14 12:44:26 -0700
commitc5b01acff187b12ec56363193208a7a4cf2469d8 (patch)
tree74fd1ff8db1a40184f503956aeaccc7897fc8c7e
parent09d314425f5bc69fcf793c7890d9e6a3cdcb44be (diff)
parent46befd6b38d802dfc5998e7d7938854578b45d9d (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull ACPI patch from Len Brown. * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: ACPICA: Fix possible fault in return package object repair code
-rw-r--r--drivers/acpi/acpica/nspredef.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 23ce09686418..fe6626035495 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -638,7 +638,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
/* Create the new outer package and populate it */
status =
- acpi_ns_wrap_with_package(data, *elements,
+ acpi_ns_wrap_with_package(data, return_object,
return_object_ptr);
if (ACPI_FAILURE(status)) {
return (status);