Commit 53225843 authored by Herbert Xu's avatar Herbert Xu
Browse files

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.
parents af7e23c6 b7b39df7

crypto/acompress.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

drivers/crypto/caam/qi.c

+3 −3
Original line number Diff line number Diff line
@@ -122,12 +122,12 @@ int caam_qi_enqueue(struct device *qidev, struct caam_drv_req *req) 
	qm_fd_addr_set64(&fd, addr);



	do {

		ret = qman_enqueue(req->drv_ctx->req_fq, &fd);

		if (likely(!ret)) {

		refcount_inc(&req->drv_ctx->refcnt);

		ret = qman_enqueue(req->drv_ctx->req_fq, &fd);

		if (likely(!ret))

			return 0;

		}



		refcount_dec(&req->drv_ctx->refcnt);

		if (ret != -EBUSY)

			break;

		num_retries++;