Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2339eb9 authored by Dan Carpenter's avatar Dan Carpenter Committed by Herbert Xu
Browse files

crypto: cavium/nitrox - dma_mapping_error() returns bool 



We want to return negative error codes here, but we're accidentally
propogating the "true" return from dma_mapping_error().

Fixes: 14fa93cd ("crypto: cavium - Add support for CNN55XX adapters.")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8bd1d400

drivers/crypto/cavium/nitrox/nitrox_reqmgr.c

+9 −6
Original line number Diff line number Diff line
@@ -199,9 +199,10 @@ static int dma_map_inbufs(struct nitrox_softreq *sr, 
	sr->in.sglist = glist;

	/* map IV */

	dma = dma_map_single(dev, &req->iv, req->ivsize, DMA_BIDIRECTIONAL);

	ret = dma_mapping_error(dev, dma);

	if (ret)

	if (dma_mapping_error(dev, dma)) {

		ret = -EINVAL;

		goto iv_map_err;

	}



	sr->in.dir = (req->src == req->dst) ? DMA_BIDIRECTIONAL : DMA_TO_DEVICE;

	/* map src entries */
@@ -268,16 +269,18 @@ static int dma_map_outbufs(struct nitrox_softreq *sr, 
	/* map ORH */

	sr->resp.orh_dma = dma_map_single(dev, &sr->resp.orh, ORH_HLEN,

					  sr->out.dir);

	ret = dma_mapping_error(dev, sr->resp.orh_dma);

	if (ret)

	if (dma_mapping_error(dev, sr->resp.orh_dma)) {

		ret = -EINVAL;

		goto orh_map_err;

	}



	/* map completion */

	sr->resp.completion_dma = dma_map_single(dev, &sr->resp.completion,

						 COMP_HLEN, sr->out.dir);

	ret = dma_mapping_error(dev, sr->resp.completion_dma);

	if (ret)

	if (dma_mapping_error(dev, sr->resp.completion_dma)) {

		ret = -EINVAL;

		goto compl_map_err;

	}



	sr->inplace = (req->src == req->dst) ? true : false;

	/* out place */