]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
[media] v4l: xilinx: missing error code
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 24 Jun 2015 14:28:31 +0000 (11:28 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 17 Jul 2015 13:01:47 +0000 (10:01 -0300)
We should set "ret" on this error path instead of returning success.

Fixes: df3305156f98 ('[media] v4l: xilinx: Add Xilinx Video IP core')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Hyun Kwon <hyun.kwon@xilinx.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/xilinx/xilinx-dma.c

index 98e50e446d57a2b835d93e65992a55ebc1918713..e779c93cb01581db606d799c6622226bad11f2a0 100644 (file)
@@ -699,8 +699,10 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma,
 
        /* ... and the buffers queue... */
        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;
+       }
 
        /* 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