Merge tag 'spi-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

[karo-tx-linux.git] / drivers / media / usb / stk1160 / stk1160-video.c

diff --git a/drivers/media/usb/stk1160/stk1160-video.c b/drivers/media/usb/stk1160/stk1160-video.c
index 940c3eaea507eb2f8070a3419ebb729b5d17b853..46191d5262eb07f3efb9fdf87c75c0665abe6687 100644 (file)
--- a/drivers/media/usb/stk1160/stk1160-video.c
+++ b/drivers/media/usb/stk1160/stk1160-video.c
@@ -96,13 +96,13 @@ void stk1160_buffer_done(struct stk1160 *dev)
 {
        struct stk1160_buffer *buf = dev->isoc_ctl.buf;
 
-       buf->vb.v4l2_buf.sequence = dev->sequence++;
-       buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;
-       buf->vb.v4l2_buf.bytesused = buf->bytesused;
-       v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+       buf->vb.sequence = dev->sequence++;
+       buf->vb.field = V4L2_FIELD_INTERLACED;
+       buf->vb.vb2_buf.planes[0].bytesused = buf->bytesused;
+       buf->vb.vb2_buf.timestamp = ktime_get_ns();
 
-       vb2_set_plane_payload(&buf->vb, 0, buf->bytesused);
-       vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
+       vb2_set_plane_payload(&buf->vb.vb2_buf, 0, buf->bytesused);
+       vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
 
        dev->isoc_ctl.buf = NULL;
 }