unload_nls() can be called with a NULL pointer now. Remove the pointer checks. Signed-off-by: Thomas Gleixner Cc: Roman Zippel --- fs/hfsplus/super.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Index: linux-2.6-tip/fs/hfsplus/super.c =================================================================== --- linux-2.6-tip.orig/fs/hfsplus/super.c +++ linux-2.6-tip/fs/hfsplus/super.c @@ -229,8 +229,7 @@ static void hfsplus_put_super(struct sup iput(HFSPLUS_SB(sb).alloc_file); iput(HFSPLUS_SB(sb).hidden_dir); brelse(HFSPLUS_SB(sb).s_vhbh); - if (HFSPLUS_SB(sb).nls) - unload_nls(HFSPLUS_SB(sb).nls); + unload_nls(HFSPLUS_SB(sb).nls); kfree(sb->s_fs_info); sb->s_fs_info = NULL; @@ -464,8 +463,7 @@ out: cleanup: hfsplus_put_super(sb); - if (nls) - unload_nls(nls); + unload_nls(nls); return err; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/