summaryrefslogtreecommitdiffstats
path: root/sys/contrib/dev/acpica/common
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2010-04-02 23:04:31 +0000
committerjkim <jkim@FreeBSD.org>2010-04-02 23:04:31 +0000
commitc22943d966183aab0b1bfca1f741ae7587c0002e (patch)
tree6ff0f37946d2a209317eb79265f81066521bd4b8 /sys/contrib/dev/acpica/common
parentbb4566312b32efc10475f0ef7b34bf3427a25225 (diff)
downloadFreeBSD-src-c22943d966183aab0b1bfca1f741ae7587c0002e.zip
FreeBSD-src-c22943d966183aab0b1bfca1f741ae7587c0002e.tar.gz
Merge ACPICA 20100331 (and four additional upstream patches).
Diffstat (limited to 'sys/contrib/dev/acpica/common')
-rw-r--r--sys/contrib/dev/acpica/common/dmextern.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/contrib/dev/acpica/common/dmextern.c b/sys/contrib/dev/acpica/common/dmextern.c
index 5966729..8d95571 100644
--- a/sys/contrib/dev/acpica/common/dmextern.c
+++ b/sys/contrib/dev/acpica/common/dmextern.c
@@ -270,6 +270,15 @@ AcpiDmNormalizeParentPrefix (
}
Length = (ACPI_STRLEN (ParentPath) + ACPI_STRLEN (Path) + 1);
+ if (ParentPath[1])
+ {
+ /*
+ * If ParentPath is not just a simple '\', increment the length
+ * for the required dot separator (ParentPath.Path)
+ */
+ Length++;
+ }
+
Fullpath = ACPI_ALLOCATE_ZEROED (Length);
if (!Fullpath)
{
OpenPOWER on IntegriCloud