Commit c5b01acf authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'release' of git://

Pull ACPI patch from Len Brown.

* 'release' of git://
  ACPICA: Fix possible fault in return package object repair code
parents 09d31442 46befd6b
......@@ -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,
if (ACPI_FAILURE(status)) {
return (status);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment