summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/namespace/nssearch.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-03 07:08:52 +0100
committerLen Brown <len.brown@intel.com>2007-02-03 07:08:52 +0100
commite8bdc5a9c56c140c732246a298922c3cf3777460 (patch)
treedfdbf3a5597dfc5b29324a4dcb303839504cd88e /drivers/acpi/namespace/nssearch.c
parentPull bugzilla-7349 into test branch (diff)
parentACPICA: fix gcc build warnings (diff)
downloadlinux-e8bdc5a9c56c140c732246a298922c3cf3777460.tar.xz
linux-e8bdc5a9c56c140c732246a298922c3cf3777460.zip
Pull acpica into test branch
Diffstat (limited to 'drivers/acpi/namespace/nssearch.c')
-rw-r--r--drivers/acpi/namespace/nssearch.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index 500e2bbcfaf7..e863be665ce8 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -321,7 +321,8 @@ acpi_ns_search_and_enter(u32 target_name,
* even though there are a few bad names.
*/
if (!acpi_ut_valid_acpi_name(target_name)) {
- target_name = acpi_ut_repair_name(target_name);
+ target_name =
+ acpi_ut_repair_name(ACPI_CAST_PTR(char, &target_name));
/* Report warning only if in strict mode or debug mode */
@@ -401,6 +402,10 @@ acpi_ns_search_and_enter(u32 target_name,
}
#endif
+ if (flags & ACPI_NS_TEMPORARY) {
+ new_node->flags |= ANOBJ_TEMPORARY;
+ }
+
/* Install the new object into the parent's list of children */
acpi_ns_install_node(walk_state, node, new_node, type);