Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[deliverable/linux.git] / drivers / staging / pohmelfs / config.c

diff --git a/drivers/staging/pohmelfs/config.c b/drivers/staging/pohmelfs/config.c
index 39413b7d387d1c341cfab722dd629996acd07414..b6c42cb0d1c64208d4b803b7563fc082385d92a6 100644 (file)
--- a/drivers/staging/pohmelfs/config.c
+++ b/drivers/staging/pohmelfs/config.c
@@ -134,7 +134,7 @@ int pohmelfs_copy_config(struct pohmelfs_sb *psb)
                goto out_unlock;
 
        /*
-        * Run over all entries in given config group and try to crate and
+        * Run over all entries in given config group and try to create and
         * initialize those, which do not exist in superblock list.
         * Skip all existing entries.
         */
@@ -601,11 +601,9 @@ void pohmelfs_config_exit(void)
 
                list_del(&g->group_entry);
 
-               if (g->hash_string)
-                       kfree(g->hash_string);
+               kfree(g->hash_string);
 
-               if (g->cipher_string)
-                       kfree(g->cipher_string);
+               kfree(g->cipher_string);
 
                kfree(g);
        }