brain-hackers_pepepper-mirror
/
linux-brain
mirror of https://github.com/brain-hackers/linux-brain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #56 from toradex/4.14-2.0.x-imx 

crypto: mxs-dcp: remove merge conflict markers
This commit is contained in:
Otavio Salvador 2019-12-19 13:25:07 -03:00 committed by GitHub
parent fa8a03bec6 7174752387
commit 1d832e20c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/crypto/mxs-dcp.c
View File

@ -595,8 +595,6 @@ static int mxs_dcp_run_sha(struct ahash_request *req)
desc->payload = 0;
desc->status = 0;
==== BASE ====
==== BASE ====
/* Set HASH_TERM bit for last transfer block. */
if (rctx->fini) {
digest_phys = dma_map_single(sdcp->dev, sdcp->coh->sha_out_buf,