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

Commit f08c84d4 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Greg Kroah-Hartman
Browse files

dmaengine: mv_xor_v2: handle mv_xor_v2_prep_sw_desc() error properly 



commit eb8df543e444492328f506adffc7dfe94111f1bd upstream.

The mv_xor_v2_prep_sw_desc() is called from a few different places in
the driver, but we never take into account the fact that it might
return NULL. This commit fixes that, ensuring that we don't panic if
there are no more descriptors available.

Fixes: 19a340b1 ("dmaengine: mv_xor_v2: new driver")
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2e9d10b

drivers/dma/mv_xor_v2.c

+6 −0
Original line number Diff line number Diff line
@@ -389,6 +389,8 @@ mv_xor_v2_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, 
		__func__, len, &src, &dest, flags);



	sw_desc = mv_xor_v2_prep_sw_desc(xor_dev);

	if (!sw_desc)

		return NULL;



	sw_desc->async_tx.flags = flags;
@@ -443,6 +445,8 @@ mv_xor_v2_prep_dma_xor(struct dma_chan *chan, dma_addr_t dest, dma_addr_t *src, 
		__func__, src_cnt, len, &dest, flags);



	sw_desc = mv_xor_v2_prep_sw_desc(xor_dev);

	if (!sw_desc)

		return NULL;



	sw_desc->async_tx.flags = flags;
@@ -491,6 +495,8 @@ mv_xor_v2_prep_dma_interrupt(struct dma_chan *chan, unsigned long flags) 
		container_of(chan, struct mv_xor_v2_device, dmachan);



	sw_desc = mv_xor_v2_prep_sw_desc(xor_dev);

	if (!sw_desc)

		return NULL;



	/* set the HW descriptor */

	hw_descriptor = &sw_desc->hw_desc;