aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/namespace/nssearch.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/namespace/nssearch.c')
-rw-r--r--drivers/acpi/namespace/nssearch.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index c1b1943d4670..f094a2eb8512 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -5,7 +5,7 @@
5 ******************************************************************************/ 5 ******************************************************************************/
6 6
7/* 7/*
8 * Copyright (C) 2000 - 2005, R. Byron Moore 8 * Copyright (C) 2000 - 2006, R. Byron Moore
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
@@ -298,18 +298,15 @@ acpi_ns_search_and_enter(u32 target_name,
298 /* Parameter validation */ 298 /* Parameter validation */
299 299
300 if (!node || !target_name || !return_node) { 300 if (!node || !target_name || !return_node) {
301 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 301 ACPI_REPORT_ERROR(("Null param: Node %p Name %X return_node %p\n", node, target_name, return_node));
302 "Null param: Node %p Name %X return_node %p\n",
303 node, target_name, return_node));
304
305 ACPI_REPORT_ERROR(("ns_search_and_enter: Null parameter\n"));
306 return_ACPI_STATUS(AE_BAD_PARAMETER); 302 return_ACPI_STATUS(AE_BAD_PARAMETER);
307 } 303 }
308 304
309 /* Name must consist of printable characters */ 305 /* Name must consist of printable characters */
310 306
311 if (!acpi_ut_valid_acpi_name(target_name)) { 307 if (!acpi_ut_valid_acpi_name(target_name)) {
312 ACPI_REPORT_ERROR(("ns_search_and_enter: Bad character in ACPI Name: %X\n", target_name)); 308 ACPI_REPORT_ERROR(("Bad character in ACPI Name: %X\n",
309 target_name));
313 return_ACPI_STATUS(AE_BAD_CHARACTER); 310 return_ACPI_STATUS(AE_BAD_CHARACTER);
314 } 311 }
315 312