ACPI fix for 5.14-rc5

Revert a recent ACPICA commit causing boot issues to appear on some
 systems.
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmENdWsSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxVlYP/1Ky/uLvm++uB1jxZUtp6riecU1MJo9U
 TKk7JZpGmHJH4EBapAMKdVhw56MfjbvNt3xmDvCl5spP0oDG2PS6FlAW2PzUdpxy
 nwlxKcRcfGbY6qOL6Vj8N70SprDe/WjpuQ5MQVrG1KGwEXifVe6Rmwt3To/pjvWI
 bygu7WYRutYthflh1pbc4Ns4sIhROfz8ws2MWb/c+eA12a2pWPEn+OXv4+y5riTl
 x1C+lrAH1rO+qdwhu28ooBnxfbIid33scbW97I5bRVGjOXp0Az42p5i6F50RFLwg
 M20JLMUuV89mYBFZdJnZF9or7Nxp0AYQoQ8lJhX5NeSx7bjhw+uAS63pc2iiYQZy
 FF1czsXcUy+sZvH2EfoJ8Er1nBPiJdjl175vGARP9lDLPI2s3jK+wbsMZSteqBmn
 0bp7U5X3HGwybnM4yQ+AEr74BT72H7IPpqgVsU+6djhvqFqnPHDmtS86xPjX19g0
 sZiUWp9ILRddRx+GtVTedD78O+Re/MERch/Zq2sgf79Pv3qPKi7kyFjhbCAhhHNJ
 bWbhGc4Y+wC62gUQewaCbhzwW+UOMmwwfbrP+eoF8+WlPsa8l9h9lOsugjN0AHj5
 KQYIclAgAQ/2MaQZhxjCuOVsiFdBYTjwiCna9WL8IdRq3eSNCT6ooIwK9AYIrP51
 y50DoGruTxiY
 =TD4+
 -----END PGP SIGNATURE-----

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"
This commit is contained in:
Linus Torvalds 2021-08-06 12:22:47 -07:00
commit 5d609689d9

View file

@ -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++;