X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=crypto%2Fcbc.c;h=780ee27b2d43d5f3620d32c4df6c00670b6c48c8;hb=2f7c3a18a2dc79ddf7b83ae199b099a675e1adb2;hp=6affff882cf835bb88f43e0e5aa68951a8e2ac1a;hpb=8f859016ea49cd8d7c743533bd1ab3db9a813ffa;p=deliverable%2Flinux.git

diff --git a/crypto/cbc.c b/crypto/cbc.c
index 6affff882cf8..780ee27b2d43 100644
--- a/crypto/cbc.c
+++ b/crypto/cbc.c
@@ -224,7 +224,7 @@ static struct crypto_instance *crypto_cbc_alloc(struct rtattr **tb)
 	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 = ERR_PTR(-EINVAL);
 	if (!is_power_of_2(alg->cra_blocksize))
@@ -289,3 +289,4 @@ module_exit(crypto_cbc_module_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("CBC block cipher algorithm");
+MODULE_ALIAS_CRYPTO("cbc");