From 00dcf483631e637bfdadb8c96a64441f82921670 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 17 Dec 2012 07:38:16 -0300 Subject: [PATCH] --- yaml --- r: 349031 b: refs/heads/master c: ac706bf75cb99b91bf2792c52ab5b2e4b94560a1 h: refs/heads/master i: 349029: 0702d1e86dc074093d4156bc73f28ec15bfdf840 349027: 4057b93c5aa54a3092d777c44d7b563c661dcf5b 349023: c9057abccc84ebdebbe22c641cbd907403fed513 v: v3 --- [refs] | 2 +- trunk/drivers/media/v4l2-core/videobuf2-core.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e8a31181adac..3b12c7383dee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9699088e4bfaff1778d26192756a5894c3f947b +refs/heads/master: ac706bf75cb99b91bf2792c52ab5b2e4b94560a1 diff --git a/trunk/drivers/media/v4l2-core/videobuf2-core.c b/trunk/drivers/media/v4l2-core/videobuf2-core.c index 9f81be23a81f..e02c4797b1c6 100644 --- a/trunk/drivers/media/v4l2-core/videobuf2-core.c +++ b/trunk/drivers/media/v4l2-core/videobuf2-core.c @@ -921,8 +921,10 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b * In videobuf we use our internal V4l2_planes struct for * single-planar buffers as well, for simplicity. */ - if (V4L2_TYPE_IS_OUTPUT(b->type)) + if (V4L2_TYPE_IS_OUTPUT(b->type)) { v4l2_planes[0].bytesused = b->bytesused; + v4l2_planes[0].data_offset = 0; + } if (b->memory == V4L2_MEMORY_USERPTR) { v4l2_planes[0].m.userptr = b->m.userptr;