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

[cascardo/linux.git] / crypto / aead.c

diff --git a/crypto/aead.c b/crypto/aead.c
index 547491e..2222710 100644 (file)
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -448,7 +448,8 @@ static int crypto_nivaead_default(struct crypto_alg *alg, u32 type, u32 mask)
        if (IS_ERR(inst))
                goto put_tmpl;
 
-       if ((err = crypto_register_instance(tmpl, inst))) {
+       err = crypto_register_instance(tmpl, inst);
+       if (err) {
                tmpl->free(inst);
                goto put_tmpl;
        }