Patch "[media] v4l: xilinx: missing error code" has been added to the 4.2-stable tree

This is a note to let you know that I've just added the patch titled

[media] v4l: xilinx: missing error code

to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
v4l-xilinx-missing-error-code.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Dan Carpenter <[email protected]>
Date: Wed, 24 Jun 2015 11:28:31 -0300
Subject: [media] v4l: xilinx: missing error code

From: Dan Carpenter <[email protected]>

commit e31f8f00bfc081ec1881d92a2dd192aeddf1d9d7 upstream.

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

---
 drivers/media/platform/xilinx/xilinx-dma.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

@@ -699,8 +699,10 @@ int xvip_dma_init(struct xvip_composite_
 
 	/* ... 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

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/v4l-xilinx-missing-error-code.patch