superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Merge crypto tree to pick up scompress and caam fixes.  The scompress
fix has a non-trivial resolution as the code in question has moved
over to acompress.
pull/1250/head
Herbert Xu 2025-04-09 21:33:40 +08:00
parent af7e23c616 b7b39df7e7
commit 5322584385
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/acompress.c
View File

@ -483,6 +483,9 @@ void crypto_acomp_free_streams(struct crypto_acomp_streams *s)
void (*free_ctx)(void *);
int i;
if (!streams)
return;
cancel_work_sync(&s->stream_work);
free_ctx = s->free_ctx;

6
drivers/crypto/caam/qi.c
View File

@ -122,12 +122,12 @@ int caam_qi_enqueue(struct device *qidev, struct caam_drv_req *req)
qm_fd_addr_set64(&fd, addr);
do {
refcount_inc(&req->drv_ctx->refcnt);
ret = qman_enqueue(req->drv_ctx->req_fq, &fd);
if (likely(!ret)) {
refcount_inc(&req->drv_ctx->refcnt);
if (likely(!ret))
return 0;
}
refcount_dec(&req->drv_ctx->refcnt);
if (ret != -EBUSY)
break;
num_retries++;