Commit 5d609689 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "Revert a recent ACPICA commit causing boot issues to appear on some
  systems"

* tag 'acpi-5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPICA: Fix memory leak caused by _CID repair function"
parents 3dc064d2 6511a8b5

drivers/acpi/acpica/nsrepair2.c

+0 −7
Original line number Diff line number Diff line
@@ -379,13 +379,6 @@ acpi_ns_repair_CID(struct acpi_evaluate_info *info, 


			(*element_ptr)->common.reference_count =

			    original_ref_count;



			/*

			 * The original_element holds a reference from the package object

			 * that represents _HID. Since a new element was created by _HID,

			 * remove the reference from the _CID package.

			 */

			acpi_ut_remove_reference(original_element);

		}



		element_ptr++;