Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / fs / f2fs / crypto_key.c

diff --git a/fs/f2fs/crypto_key.c b/fs/f2fs/crypto_key.c
index 95b8f936f00b647086b4d8bb61b36295d2e915cc..9f77de2ef317e538ced76d5472c62df4de29fcaf 100644 (file)
--- a/fs/f2fs/crypto_key.c
+++ b/fs/f2fs/crypto_key.c
@@ -92,8 +92,7 @@ static void f2fs_free_crypt_info(struct f2fs_crypt_info *ci)
        if (!ci)
                return;
 
-       if (ci->ci_keyring_key)
-               key_put(ci->ci_keyring_key);
+       key_put(ci->ci_keyring_key);
        crypto_free_ablkcipher(ci->ci_ctfm);
        kmem_cache_free(f2fs_crypt_info_cachep, ci);
 }