diff options
author | Cyrille Pitchen <cyrille.pitchen@atmel.com> | 2017-02-09 11:51:20 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-02-15 00:23:32 -0500 |
commit | dd3f9f40b58168f91f27ab686c7bae1f35edd3d4 (patch) | |
tree | b3ce83c4c71f958b45cc2a6fbf6febda49771d1e | |
parent | f7cc02b3c3a33a10dd5bb9e5dfd22e47e09503a2 (diff) |
crypto: atmel-sha - fix missing "return" instructions
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>
-rw-r--r-- | drivers/crypto/atmel-sha.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c index 50a1dcd50c46..bc033178d0e7 100644 --- a/drivers/crypto/atmel-sha.c +++ b/drivers/crypto/atmel-sha.c | |||
@@ -668,7 +668,7 @@ static int atmel_sha_xmit_dma(struct atmel_sha_dev *dd, dma_addr_t dma_addr1, | |||
668 | DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 668 | DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
669 | } | 669 | } |
670 | if (!in_desc) | 670 | if (!in_desc) |
671 | atmel_sha_complete(dd, -EINVAL); | 671 | return atmel_sha_complete(dd, -EINVAL); |
672 | 672 | ||
673 | in_desc->callback = atmel_sha_dma_callback; | 673 | in_desc->callback = atmel_sha_dma_callback; |
674 | in_desc->callback_param = dd; | 674 | in_desc->callback_param = dd; |
@@ -725,7 +725,7 @@ static int atmel_sha_xmit_dma_map(struct atmel_sha_dev *dd, | |||
725 | if (dma_mapping_error(dd->dev, ctx->dma_addr)) { | 725 | if (dma_mapping_error(dd->dev, ctx->dma_addr)) { |
726 | dev_err(dd->dev, "dma %zu bytes error\n", ctx->buflen + | 726 | dev_err(dd->dev, "dma %zu bytes error\n", ctx->buflen + |
727 | ctx->block_size); | 727 | ctx->block_size); |
728 | atmel_sha_complete(dd, -EINVAL); | 728 | return atmel_sha_complete(dd, -EINVAL); |
729 | } | 729 | } |
730 | 730 | ||
731 | ctx->flags &= ~SHA_FLAGS_SG; | 731 | ctx->flags &= ~SHA_FLAGS_SG; |
@@ -816,7 +816,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd) | |||
816 | if (dma_mapping_error(dd->dev, ctx->dma_addr)) { | 816 | if (dma_mapping_error(dd->dev, ctx->dma_addr)) { |
817 | dev_err(dd->dev, "dma %zu bytes error\n", | 817 | dev_err(dd->dev, "dma %zu bytes error\n", |
818 | ctx->buflen + ctx->block_size); | 818 | ctx->buflen + ctx->block_size); |
819 | atmel_sha_complete(dd, -EINVAL); | 819 | return atmel_sha_complete(dd, -EINVAL); |
820 | } | 820 | } |
821 | 821 | ||
822 | if (length == 0) { | 822 | if (length == 0) { |
@@ -830,7 +830,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd) | |||
830 | if (!dma_map_sg(dd->dev, ctx->sg, 1, | 830 | if (!dma_map_sg(dd->dev, ctx->sg, 1, |
831 | DMA_TO_DEVICE)) { | 831 | DMA_TO_DEVICE)) { |
832 | dev_err(dd->dev, "dma_map_sg error\n"); | 832 | dev_err(dd->dev, "dma_map_sg error\n"); |
833 | atmel_sha_complete(dd, -EINVAL); | 833 | return atmel_sha_complete(dd, -EINVAL); |
834 | } | 834 | } |
835 | 835 | ||
836 | ctx->flags |= SHA_FLAGS_SG; | 836 | ctx->flags |= SHA_FLAGS_SG; |
@@ -844,7 +844,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd) | |||
844 | 844 | ||
845 | if (!dma_map_sg(dd->dev, ctx->sg, 1, DMA_TO_DEVICE)) { | 845 | if (!dma_map_sg(dd->dev, ctx->sg, 1, DMA_TO_DEVICE)) { |
846 | dev_err(dd->dev, "dma_map_sg error\n"); | 846 | dev_err(dd->dev, "dma_map_sg error\n"); |
847 | atmel_sha_complete(dd, -EINVAL); | 847 | return atmel_sha_complete(dd, -EINVAL); |
848 | } | 848 | } |
849 | 849 | ||
850 | ctx->flags |= SHA_FLAGS_SG; | 850 | ctx->flags |= SHA_FLAGS_SG; |