]> git.baikalelectronics.ru Git - kernel.git/commitdiff
crypto: atmel-sha - fix missing "return" instructions
authorCyrille Pitchen <cyrille.pitchen@atmel.com>
Thu, 9 Feb 2017 16:51:20 +0000 (17:51 +0100)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 15 Feb 2017 05:23:32 +0000 (13:23 +0800)
This patch fixes a previous patch: "crypto: atmel-sha - update request
queue management to make it more generic".

Indeed the patch above should have replaced the "return -EINVAL;" lines by
"return atmel_sha_complete(dd, -EINVAL);" but instead replaced them by a
simple call of "atmel_sha_complete(dd, -EINVAL);".
Hence all "return" instructions were missing.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/atmel-sha.c

index 50a1dcd50c462b481c35190b807fdb4fd728cdcc..bc033178d0e7e9a44e64eb99ad9fe70138c4c0c2 100644 (file)
@@ -668,7 +668,7 @@ static int atmel_sha_xmit_dma(struct atmel_sha_dev *dd, dma_addr_t dma_addr1,
                        DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
        }
        if (!in_desc)
-               atmel_sha_complete(dd, -EINVAL);
+               return atmel_sha_complete(dd, -EINVAL);
 
        in_desc->callback = atmel_sha_dma_callback;
        in_desc->callback_param = dd;
@@ -725,7 +725,7 @@ static int atmel_sha_xmit_dma_map(struct atmel_sha_dev *dd,
        if (dma_mapping_error(dd->dev, ctx->dma_addr)) {
                dev_err(dd->dev, "dma %zu bytes error\n", ctx->buflen +
                                ctx->block_size);
-               atmel_sha_complete(dd, -EINVAL);
+               return atmel_sha_complete(dd, -EINVAL);
        }
 
        ctx->flags &= ~SHA_FLAGS_SG;
@@ -816,7 +816,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd)
                if (dma_mapping_error(dd->dev, ctx->dma_addr)) {
                        dev_err(dd->dev, "dma %zu bytes error\n",
                                ctx->buflen + ctx->block_size);
-                       atmel_sha_complete(dd, -EINVAL);
+                       return atmel_sha_complete(dd, -EINVAL);
                }
 
                if (length == 0) {
@@ -830,7 +830,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd)
                        if (!dma_map_sg(dd->dev, ctx->sg, 1,
                                DMA_TO_DEVICE)) {
                                        dev_err(dd->dev, "dma_map_sg  error\n");
-                                       atmel_sha_complete(dd, -EINVAL);
+                                       return atmel_sha_complete(dd, -EINVAL);
                        }
 
                        ctx->flags |= SHA_FLAGS_SG;
@@ -844,7 +844,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd)
 
        if (!dma_map_sg(dd->dev, ctx->sg, 1, DMA_TO_DEVICE)) {
                dev_err(dd->dev, "dma_map_sg  error\n");
-               atmel_sha_complete(dd, -EINVAL);
+               return atmel_sha_complete(dd, -EINVAL);
        }
 
        ctx->flags |= SHA_FLAGS_SG;