Commit dd3f9f40 authored by Cyrille Pitchen's avatar Cyrille Pitchen Committed by Herbert Xu

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@atmel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f7cc02b3
...@@ -668,7 +668,7 @@ static int atmel_sha_xmit_dma(struct atmel_sha_dev *dd, dma_addr_t dma_addr1, ...@@ -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); DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
} }
if (!in_desc) if (!in_desc)
atmel_sha_complete(dd, -EINVAL); return atmel_sha_complete(dd, -EINVAL);
in_desc->callback = atmel_sha_dma_callback; in_desc->callback = atmel_sha_dma_callback;
in_desc->callback_param = dd; in_desc->callback_param = dd;
...@@ -725,7 +725,7 @@ static int atmel_sha_xmit_dma_map(struct atmel_sha_dev *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)) { if (dma_mapping_error(dd->dev, ctx->dma_addr)) {
dev_err(dd->dev, "dma %zu bytes error\n", ctx->buflen + dev_err(dd->dev, "dma %zu bytes error\n", ctx->buflen +
ctx->block_size); ctx->block_size);
atmel_sha_complete(dd, -EINVAL); return atmel_sha_complete(dd, -EINVAL);
} }
ctx->flags &= ~SHA_FLAGS_SG; ctx->flags &= ~SHA_FLAGS_SG;
...@@ -816,7 +816,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd) ...@@ -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)) { if (dma_mapping_error(dd->dev, ctx->dma_addr)) {
dev_err(dd->dev, "dma %zu bytes error\n", dev_err(dd->dev, "dma %zu bytes error\n",
ctx->buflen + ctx->block_size); ctx->buflen + ctx->block_size);
atmel_sha_complete(dd, -EINVAL); return atmel_sha_complete(dd, -EINVAL);
} }
if (length == 0) { if (length == 0) {
...@@ -830,7 +830,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd) ...@@ -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, if (!dma_map_sg(dd->dev, ctx->sg, 1,
DMA_TO_DEVICE)) { DMA_TO_DEVICE)) {
dev_err(dd->dev, "dma_map_sg error\n"); 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; ctx->flags |= SHA_FLAGS_SG;
...@@ -844,7 +844,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd) ...@@ -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)) { if (!dma_map_sg(dd->dev, ctx->sg, 1, DMA_TO_DEVICE)) {
dev_err(dd->dev, "dma_map_sg error\n"); 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; ctx->flags |= SHA_FLAGS_SG;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment