From: Bob Moore Date: Tue, 29 Dec 2015 06:04:11 +0000 (+0800) Subject: ACPICA: Add "root node" case to the ACPI name repair code X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2247235379d9e9fa46f725a82e0c05ae96254007;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ACPICA: Add "root node" case to the ACPI name repair code ACPICA commit 95b40b31aa8148629fbe5de0356725fc01298003 Special-case the namespace root node, it has an unusual name. This case can occur if there are errors during the execution of module-level code. Link: https://github.com/acpica/acpica/commit/95b40b31 Signed-off-by: Bob Moore Signed-off-by: Lv Zheng Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/acpica/utstring.c b/drivers/acpi/acpica/utstring.c index 0c2e2d23aa8d..958b2f7b552d 100644 --- a/drivers/acpi/acpica/utstring.c +++ b/drivers/acpi/acpica/utstring.c @@ -240,6 +240,14 @@ void acpi_ut_repair_name(char *name) ACPI_FUNCTION_NAME(ut_repair_name); + /* + * Special case for the root node. This can happen if we get an + * error during the execution of module-level code. + */ + if (ACPI_COMPARE_NAME(name, "\\___")) { + return; + } + ACPI_MOVE_NAME(&original_name, name); /* Check each character in the name */