| Message ID | 20150624142831.GB1702@mwanda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Dan, Thank you for the patch. On Wednesday 24 June 2015 17:28:31 Dan Carpenter wrote: > 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: Laurent Pinchart <laurent.pinchart@ideasonboard.com> and applied to my tree. > diff --git a/drivers/media/platform/xilinx/xilinx-dma.c > b/drivers/media/platform/xilinx/xilinx-dma.c index 98e50e4..e779c93 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
diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c index 98e50e4..e779c93 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
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> -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html