summaryrefslogtreecommitdiff
path: root/sys/contrib/dev/acpica/nsxfname.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/dev/acpica/nsxfname.c')
-rw-r--r--sys/contrib/dev/acpica/nsxfname.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/contrib/dev/acpica/nsxfname.c b/sys/contrib/dev/acpica/nsxfname.c
index 7133b9f11ac88..faab4876a3116 100644
--- a/sys/contrib/dev/acpica/nsxfname.c
+++ b/sys/contrib/dev/acpica/nsxfname.c
@@ -2,7 +2,7 @@
*
* Module Name: nsxfname - Public interfaces to the ACPI subsystem
* ACPI Namespace oriented interfaces
- * $Revision: 71 $
+ * $Revision: 72 $
*
*****************************************************************************/
@@ -155,7 +155,7 @@ AcpiGetHandle (
ACPI_HANDLE *RetHandle)
{
ACPI_STATUS Status;
- ACPI_NAMESPACE_NODE *Node;
+ ACPI_NAMESPACE_NODE *Node = NULL;
ACPI_NAMESPACE_NODE *PrefixNode = NULL;
@@ -168,14 +168,13 @@ AcpiGetHandle (
{
AcpiCmAcquireMutex (ACPI_MTX_NAMESPACE);
- Node = AcpiNsConvertHandleToEntry (Parent);
- if (!Node)
+ PrefixNode = AcpiNsConvertHandleToEntry (Parent);
+ if (!PrefixNode)
{
AcpiCmReleaseMutex (ACPI_MTX_NAMESPACE);
return (AE_BAD_PARAMETER);
}
- PrefixNode = Node->Child;
AcpiCmReleaseMutex (ACPI_MTX_NAMESPACE);
}
@@ -191,8 +190,7 @@ AcpiGetHandle (
/*
* Find the Node and convert to the user format
*/
- Node = NULL;
- Status = AcpiNsGetNode (Pathname, PrefixNode, &Node);
+ Status = AcpiNsGetNode (Pathname, Node, &Node);
*RetHandle = NULL;
if(ACPI_SUCCESS(Status))