From 43d29854fc9bb0cfb115a753bb967074e2a3491f Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 28 Sep 2012 06:24:18 -0300
Subject: [PATCH] --- yaml --- r: 333788 b: refs/heads/master c:
 3c0b60618118745220bc0f9bf27e51e37367427c h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/v4l2-core/videobuf2-core.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e364f517a66a..d79a726077d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32a772603173f9e1bf675c01e4649e3fe3b794bc
+refs/heads/master: 3c0b60618118745220bc0f9bf27e51e37367427c
diff --git a/trunk/drivers/media/v4l2-core/videobuf2-core.c b/trunk/drivers/media/v4l2-core/videobuf2-core.c
index 5a132b286894..432df119af27 100644
--- a/trunk/drivers/media/v4l2-core/videobuf2-core.c
+++ b/trunk/drivers/media/v4l2-core/videobuf2-core.c
@@ -348,6 +348,7 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b)
 		 * Fill in plane-related data if userspace provided an array
 		 * for it. The caller has already verified memory and size.
 		 */
+		b->length = vb->num_planes;
 		memcpy(b->m.planes, vb->v4l2_planes,
 			b->length * sizeof(struct v4l2_plane));
 	} else {