Merge tag 'driver-core-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / fs / jfs / super.c

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 16c3a9556634ddf7b294bf85bb73c2a5025258b3..5d30c56ae07506f09f92d11d02b03a39213a0797 100644 (file)
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -619,8 +619,7 @@ out_mount_failed:
        iput(sbi->direct_inode);
        sbi->direct_inode = NULL;
 out_unload:
-       if (sbi->nls_tab)
-               unload_nls(sbi->nls_tab);
+       unload_nls(sbi->nls_tab);
 out_kfree:
        kfree(sbi);
        return ret;