diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-06-24 11:28:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-07-17 10:01:47 -0300 |
| commit | e31f8f00bfc081ec1881d92a2dd192aeddf1d9d7 (patch) | |
| tree | a01e7ebbd50dca7bbadeb5df1165bf1e49cca897 /drivers/media/platform/xilinx/xilinx-dma.c | |
| parent | d32d98642de66048f9534a05f3641558e811bbc9 (diff) | |
| download | blackbird-op-linux-e31f8f00bfc081ec1881d92a2dd192aeddf1d9d7.tar.gz blackbird-op-linux-e31f8f00bfc081ec1881d92a2dd192aeddf1d9d7.zip | |
[media] v4l: xilinx: missing error code
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>
Diffstat (limited to 'drivers/media/platform/xilinx/xilinx-dma.c')
| -rw-r--r-- | drivers/media/platform/xilinx/xilinx-dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c index 98e50e446d57..e779c93cb015 100644 --- a/drivers/media/platform/xilinx/xilinx-dma.c +++ b/drivers/media/platform/xilinx/xilinx-dma.c @@ -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 |
