Merge ../linux-2.6

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c
index 1be11ce96b0f..aeb0106890e4 100644
--- a/fs/openpromfs/inode.c
+++ b/fs/openpromfs/inode.c
@@ -1088,8 +1088,7 @@ static void __exit exit_openprom_fs(void)
         unregister_filesystem(&openprom_fs_type);
         free_pages ((unsigned long)nodes, alloced);
         for (i = 0; i < aliases_nodes; i++)
-                if (alias_names [i])
-                        kfree (alias_names [i]);
+                kfree (alias_names [i]);
         nodes = NULL;
 }