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

Linus Torvalds committed 14 years ago

Commit c5b01ac2 parents 09d3144 46befd61 file · +1 −1Browse files

Unified · Split

drivers/acpi/acpica/nspredef.c+1−1

@@ -638,7 +638,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data, · 637 unmodified lines
638	/* Create the new outer package and populate it */	638	/* Create the new outer package and populate it */
639		639
640	status =	640	status =
641	acpi_ns_wrap_with_package(data, *elements,	641	acpi_ns_wrap_with_package(data, return_object,
642	return_object_ptr);	642	return_object_ptr);
643	if (ACPI_FAILURE(status)) {	643	if (ACPI_FAILURE(status)) {
644	return (status);	644	return (status);