Commit 06435f34 authored by Markus Elfring's avatar Markus Elfring Committed by Herbert Xu

crypto: caam - Move common error handling code in two functions

Move statements for error handling which were identical
in two if branches to the end of these functions.
Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9e6df0fd
...@@ -1231,9 +1231,7 @@ static int ahash_final_no_ctx(struct ahash_request *req) ...@@ -1231,9 +1231,7 @@ static int ahash_final_no_ctx(struct ahash_request *req)
state->buf_dma = dma_map_single(jrdev, buf, buflen, DMA_TO_DEVICE); state->buf_dma = dma_map_single(jrdev, buf, buflen, DMA_TO_DEVICE);
if (dma_mapping_error(jrdev, state->buf_dma)) { if (dma_mapping_error(jrdev, state->buf_dma)) {
dev_err(jrdev, "unable to map src\n"); dev_err(jrdev, "unable to map src\n");
ahash_unmap(jrdev, edesc, req, digestsize); goto unmap;
kfree(edesc);
return -ENOMEM;
} }
append_seq_in_ptr(desc, state->buf_dma, buflen, 0); append_seq_in_ptr(desc, state->buf_dma, buflen, 0);
...@@ -1242,9 +1240,7 @@ static int ahash_final_no_ctx(struct ahash_request *req) ...@@ -1242,9 +1240,7 @@ static int ahash_final_no_ctx(struct ahash_request *req)
digestsize); digestsize);
if (dma_mapping_error(jrdev, edesc->dst_dma)) { if (dma_mapping_error(jrdev, edesc->dst_dma)) {
dev_err(jrdev, "unable to map dst\n"); dev_err(jrdev, "unable to map dst\n");
ahash_unmap(jrdev, edesc, req, digestsize); goto unmap;
kfree(edesc);
return -ENOMEM;
} }
edesc->src_nents = 0; edesc->src_nents = 0;
...@@ -1262,6 +1258,11 @@ static int ahash_final_no_ctx(struct ahash_request *req) ...@@ -1262,6 +1258,11 @@ static int ahash_final_no_ctx(struct ahash_request *req)
} }
return ret; return ret;
unmap:
ahash_unmap(jrdev, edesc, req, digestsize);
kfree(edesc);
return -ENOMEM;
} }
/* submit ahash update if it the first job descriptor after update */ /* submit ahash update if it the first job descriptor after update */
...@@ -1453,18 +1454,14 @@ static int ahash_finup_no_ctx(struct ahash_request *req) ...@@ -1453,18 +1454,14 @@ static int ahash_finup_no_ctx(struct ahash_request *req)
req->nbytes); req->nbytes);
if (ret) { if (ret) {
dev_err(jrdev, "unable to map S/G table\n"); dev_err(jrdev, "unable to map S/G table\n");
ahash_unmap(jrdev, edesc, req, digestsize); goto unmap;
kfree(edesc);
return -ENOMEM;
} }
edesc->dst_dma = map_seq_out_ptr_result(desc, jrdev, req->result, edesc->dst_dma = map_seq_out_ptr_result(desc, jrdev, req->result,
digestsize); digestsize);
if (dma_mapping_error(jrdev, edesc->dst_dma)) { if (dma_mapping_error(jrdev, edesc->dst_dma)) {
dev_err(jrdev, "unable to map dst\n"); dev_err(jrdev, "unable to map dst\n");
ahash_unmap(jrdev, edesc, req, digestsize); goto unmap;
kfree(edesc);
return -ENOMEM;
} }
#ifdef DEBUG #ifdef DEBUG
...@@ -1481,6 +1478,11 @@ static int ahash_finup_no_ctx(struct ahash_request *req) ...@@ -1481,6 +1478,11 @@ static int ahash_finup_no_ctx(struct ahash_request *req)
} }
return ret; return ret;
unmap:
ahash_unmap(jrdev, edesc, req, digestsize);
kfree(edesc);
return -ENOMEM;
} }
/* submit first update job descriptor after init */ /* submit first update job descriptor after init */
......
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