summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2016-09-15 05:27:15 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2016-09-22 12:27:34 +0200
commit59af156625ab1d11436b04806ee3c1c795b29a93 (patch)
treeac20c156e219c8de1d2e18b85294b65b68ea6f82
parentcrypto: squash lines for simple wrapper functions (diff)
downloadlinux-59af156625ab1d11436b04806ee3c1c795b29a93.tar.xz
linux-59af156625ab1d11436b04806ee3c1c795b29a93.zip
crypto: omap-des - fix error return code in omap_des_probe()
Fix to return error code -ENOMEM from the crypto_engine_alloc_init() error handling case instead of 0, as done elsewhere in this function. Fixes: f1b77aaca85a ("crypto: omap-des - Integrate with the crypto engine framework") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/omap-des.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index 2b20d960caa8..a6f65532fd16 100644
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -1081,8 +1081,10 @@ static int omap_des_probe(struct platform_device *pdev)
/* Initialize des crypto engine */
dd->engine = crypto_engine_alloc_init(dev, 1);
- if (!dd->engine)
+ if (!dd->engine) {
+ err = -ENOMEM;
goto err_engine;
+ }
dd->engine->prepare_cipher_request = omap_des_prepare_req;
dd->engine->cipher_one_request = omap_des_crypt_req;