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

Commit e31f8f00 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: xilinx: missing error code 



We should set "ret" on this error path instead of returning success.

Fixes: df330515 ('[media] v4l: xilinx: Add Xilinx Video IP core')

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarHyun Kwon <hyun.kwon@xilinx.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent d32d9864

drivers/media/platform/xilinx/xilinx-dma.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -699,8 +699,10 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma, 




	/* ... and the buffers queue... */

	/* ... and the buffers queue... */

	dma->alloc_ctx = vb2_dma_contig_init_ctx(dma->xdev->dev);

	dma->alloc_ctx = vb2_dma_contig_init_ctx(dma->xdev->dev);

	if (IS_ERR(dma->alloc_ctx))

	if (IS_ERR(dma->alloc_ctx)) {

		ret = PTR_ERR(dma->alloc_ctx);

		goto error;

		goto error;

	}





	/* Don't enable VB2_READ and VB2_WRITE, as using the read() and write()

	/* Don't enable VB2_READ and VB2_WRITE, as using the read() and write()

	 * V4L2 APIs would be inefficient. Testing on the command line with a

	 * V4L2 APIs would be inefficient. Testing on the command line with a