diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2013-04-04 21:18:57 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2013-04-04 21:18:57 +0000 |
| commit | 0ff2ef6cfe11e98b10c26dc8f1c359e6502538c8 (patch) | |
| tree | 2d060ed4fedfc9aace2e673176570faa8ae1d376 /source/components/namespace/nseval.c | |
| parent | 6bb10c5e2fa82c104e57c7468335930ba9e47d4f (diff) | |
| download | src-0ff2ef6cfe11e98b10c26dc8f1c359e6502538c8.tar.gz src-0ff2ef6cfe11e98b10c26dc8f1c359e6502538c8.zip | |
Import ACPICA 20130328.vendor/acpica/20130328
Notes
Notes:
svn path=/vendor-sys/acpica/dist/; revision=249109
svn path=/vendor-sys/acpica/20130328/; revision=249110; tag=vendor/acpica/20130328
Diffstat (limited to 'source/components/namespace/nseval.c')
| -rw-r--r-- | source/components/namespace/nseval.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/source/components/namespace/nseval.c b/source/components/namespace/nseval.c index cdd6a9fcd004..1de341ce9024 100644 --- a/source/components/namespace/nseval.c +++ b/source/components/namespace/nseval.c @@ -109,18 +109,22 @@ AcpiNsEvaluate ( Info->ReturnObject = NULL; Info->ParamCount = 0; - /* - * Get the actual namespace node for the target object. Handles these cases: - * - * 1) Null node, Pathname (absolute path) - * 2) Node, Pathname (path relative to Node) - * 3) Node, Null Pathname - */ - Status = AcpiNsGetNode (Info->PrefixNode, Info->Pathname, - ACPI_NS_NO_UPSEARCH, &Info->ResolvedNode); - if (ACPI_FAILURE (Status)) + if (!Info->ResolvedNode) { - return_ACPI_STATUS (Status); + /* + * Get the actual namespace node for the target object if we need to. + * Handles these cases: + * + * 1) Null node, Pathname (absolute path) + * 2) Node, Pathname (path relative to Node) + * 3) Node, Null Pathname + */ + Status = AcpiNsGetNode (Info->PrefixNode, Info->Pathname, + ACPI_NS_NO_UPSEARCH, &Info->ResolvedNode); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } } /* |