git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
acpi
/
namespace
/
nsnames.c
diff --git
a/drivers/acpi/namespace/nsnames.c
b/drivers/acpi/namespace/nsnames.c
index
4316ea6
..
e0b9663
100644
(file)
--- a/
drivers/acpi/namespace/nsnames.c
+++ b/
drivers/acpi/namespace/nsnames.c
@@
-202,11
+202,7
@@
acpi_ns_get_pathname_length (
next_node = acpi_ns_get_parent_node (next_node);
}
next_node = acpi_ns_get_parent_node (next_node);
}
- if (!size) {
- size = 1; /* Root node case */
- }
-
- return (size + 1); /* +1 for null string terminator */
+ return (size + 1);
}
}
@@
-257,8
+253,7
@@
acpi_ns_handle_to_pathname (
acpi_ns_build_external_path (node, required_size, buffer->pointer);
acpi_ns_build_external_path (node, required_size, buffer->pointer);
- ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%s [%X] \n",
- (char *) buffer->pointer, (u32) required_size));
+ ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%s [%X] \n", (char *) buffer->pointer, (u32) required_size));
return_ACPI_STATUS (AE_OK);
}
return_ACPI_STATUS (AE_OK);
}