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
This commit is contained in:
commit
c5b01acff1
|
@ -638,7 +638,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
|
||||||
/* Create the new outer package and populate it */
|
/* Create the new outer package and populate it */
|
||||||
|
|
||||||
status =
|
status =
|
||||||
acpi_ns_wrap_with_package(data, *elements,
|
acpi_ns_wrap_with_package(data, return_object,
|
||||||
return_object_ptr);
|
return_object_ptr);
|
||||||
if (ACPI_FAILURE(status)) {
|
if (ACPI_FAILURE(status)) {
|
||||||
return (status);
|
return (status);
|
||||||
|
|
Loading…
Reference in New Issue