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 'lsk-v3.10-android-15.02'
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
pcbc.c
diff --git
a/crypto/pcbc.c
b/crypto/pcbc.c
index fe704775f88ff0fa526a197201c1a751a8535611..f654965f09338dab066795d8c6ab8618ef263d93 100644
(file)
--- a/
crypto/pcbc.c
+++ b/
crypto/pcbc.c
@@
-234,7
+234,7
@@
static struct crypto_instance *crypto_pcbc_alloc(struct rtattr **tb)
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
- return ERR_
PTR(PTR_ERR(alg)
);
+ return ERR_
CAST(alg
);
inst = crypto_alloc_instance("pcbc", alg);
if (IS_ERR(inst))
inst = crypto_alloc_instance("pcbc", alg);
if (IS_ERR(inst))
@@
-295,3
+295,4
@@
module_exit(crypto_pcbc_module_exit);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("PCBC block cipher algorithm");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("PCBC block cipher algorithm");
+MODULE_ALIAS_CRYPTO("pcbc");