summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2016-09-15 03:27:32 +0000
committerHerbert Xu <herbert@gondor.apana.org.au>2016-09-22 18:27:35 +0800
commitc98ef8dbca18db133bb4bc7643b975ee2612be2f (patch)
tree46ff4fa7a6c2337027d5b8b2230a928acb1b0597 /drivers
parent59af156625ab1d11436b04806ee3c1c795b29a93 (diff)
downloadlinux-stable-c98ef8dbca18db133bb4bc7643b975ee2612be2f.tar.gz
linux-stable-c98ef8dbca18db133bb4bc7643b975ee2612be2f.tar.bz2
linux-stable-c98ef8dbca18db133bb4bc7643b975ee2612be2f.zip
crypto: omap-aes - fix error return code in omap_aes_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: 0529900a01cb ("crypto: omap-aes - Support crypto engine framework") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/crypto/omap-aes.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 2033769e8381..fe32dd95ae4f 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -1215,8 +1215,10 @@ static int omap_aes_probe(struct platform_device *pdev)
/* Initialize 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_aes_prepare_req;
dd->engine->cipher_one_request = omap_aes_crypt_req;