From 4d2388d9aa2796bf55ffa29779ec9c95ed46001d Mon Sep 17 00:00:00 2001 From: Lin Ming Date: Thu, 13 Nov 2008 10:54:39 +0800 Subject: [PATCH] --- yaml --- r: 128032 b: refs/heads/master c: d037c5fd7367548191eab2b376a1d08c4ffaf7ff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/namespace/nsutils.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 33d686a8acb7..589fd5e1d157 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5572a9859fa55216597b8226717691956d3e53e3 +refs/heads/master: d037c5fd7367548191eab2b376a1d08c4ffaf7ff diff --git a/trunk/drivers/acpi/namespace/nsutils.c b/trunk/drivers/acpi/namespace/nsutils.c index b0817e1127b1..337fb04e0388 100644 --- a/trunk/drivers/acpi/namespace/nsutils.c +++ b/trunk/drivers/acpi/namespace/nsutils.c @@ -314,9 +314,15 @@ void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info) * * strlen() + 1 covers the first name_seg, which has no path separator */ - if (acpi_ns_valid_root_prefix(next_external_char[0])) { + if (acpi_ns_valid_root_prefix(*next_external_char)) { info->fully_qualified = TRUE; next_external_char++; + + /* Skip redundant root_prefix, like \\_SB.PCI0.SBRG.EC0 */ + + while (acpi_ns_valid_root_prefix(*next_external_char)) { + next_external_char++; + } } else { /* * Handle Carat prefixes