--- linux-2.5/drivers/acpi/namespace/nswalk.c.orig	2003-03-15 12:37:32.000000000 +0900
+++ linux-2.5/drivers/acpi/namespace/nswalk.c	2003-03-15 12:40:24.000000000 +0900
@@ -164,6 +164,7 @@
 	void                            **return_value)
 {
 	acpi_status                     status;
+	acpi_status                     unlock_status;
 	struct acpi_namespace_node      *child_node;
 	struct acpi_namespace_node      *parent_node;
 	acpi_object_type                child_type;
@@ -221,9 +222,9 @@
 						 context, return_value);
 
 				if (unlock_before_callback) {
-					status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
-					if (ACPI_FAILURE (status)) {
-						return_ACPI_STATUS (status);
+					unlock_status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
+					if (ACPI_FAILURE (unlock_status)) {
+						return_ACPI_STATUS (unlock_status);
 					}
 				}