Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / media / v4l2-core / videobuf2-v4l2.c

diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c
index 6c441be8f893d8e931825b63b810d67ae67a2864..9632f378a4adc138964b1eea665e4a39759013e0 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-v4l2.c
+++ b/drivers/media/v4l2-core/videobuf2-v4l2.c
@@ -199,7 +199,7 @@ static int __fill_v4l2_buffer(struct vb2_buffer *vb, void *pb)
        b->timestamp = vbuf->timestamp;
        b->timecode = vbuf->timecode;
        b->sequence = vbuf->sequence;
-       b->reserved2 = 0;
+       b->config_store = vbuf->config_store;
        b->reserved = 0;
 
        if (q->is_multiplanar) {
@@ -419,6 +419,8 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb,
                vbuf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
        }
 
+       vbuf->config_store = b->config_store;
+
        if (V4L2_TYPE_IS_OUTPUT(b->type)) {
                /*
                 * For output buffers mask out the timecode flag: