summaryrefslogtreecommitdiff
path: root/crypto/aead.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-02-17 18:48:51 -0800
committerDavid S. Miller <davem@davemloft.net>2015-02-17 18:48:51 -0800
commit11af4409245096cef96a41327ed970f8789e1c1c (patch)
tree80621c6623aa54dceafc5743c8a016b609d7dc46 /crypto/aead.c
parentbaefc38c7ec56afcfa92594930b747a050c599b7 (diff)
parent9ece59e8fd3d017e04382709a4d48e81e00246fb (diff)
downloadlinux-crypto-11af4409245096cef96a41327ed970f8789e1c1c.tar.gz
linux-crypto-11af4409245096cef96a41327ed970f8789e1c1c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'crypto/aead.c')
-rw-r--r--crypto/aead.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/aead.c b/crypto/aead.c
index 547491e3..22227107 100644
--- 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;
}