projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dm-3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk...
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
authenc.c
diff --git
a/crypto/authenc.c
b/crypto/authenc.c
index d0583a4489e60ee59a6cc0950d7342594a4d5780..ffce19de05cf958853dc0e13f7e3cf1efa30cd4f 100644
(file)
--- a/
crypto/authenc.c
+++ b/
crypto/authenc.c
@@
-592,9
+592,8
@@
static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb)
int err;
algt = crypto_get_attr_type(tb);
- err = PTR_ERR(algt);
if (IS_ERR(algt))
- return ERR_
PTR(err
);
+ return ERR_
CAST(algt
);
if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
return ERR_PTR(-EINVAL);