diff options
| author | Linus Torvalds | 2012-07-14 21:44:26 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-07-14 21:44:26 +0200 |
| commit | c5b01acff187b12ec56363193208a7a4cf2469d8 (patch) | |
| tree | 74fd1ff8db1a40184f503956aeaccc7897fc8c7e | |
| parent | vsyscall_64: add missing ifdef CONFIG_SECCOMP (diff) | |
| parent | ACPICA: Fix possible fault in return package object repair code (diff) | |
| download | kernel-qcow2-linux-c5b01acff187b12ec56363193208a7a4cf2469d8.tar.gz kernel-qcow2-linux-c5b01acff187b12ec56363193208a7a4cf2469d8.tar.xz kernel-qcow2-linux-c5b01acff187b12ec56363193208a7a4cf2469d8.zip | |
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.c | 2 |
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); |