summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-08-06 12:22:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-08-06 12:22:47 -0700
commit5d609689d9ff4db12cd38074518e3a19ef0b24a1 (patch)
tree4e10b4dbb145e26c4e8229a5a21a7cf489850b34
parent3dc064d29dfbaee66a08ff1cfbb2dff4439302fe (diff)
parent6511a8b5b7a65037340cd8ee91a377811effbc83 (diff)
downloadlinux-5d609689d9ff4db12cd38074518e3a19ef0b24a1.tar.bz2
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"
-rw-r--r--drivers/acpi/acpica/nsrepair2.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 38e10ab976e6..14b71b41e845 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -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++;