]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
[media] au0828: fix broken streaming
authorHans Verkuil <hverkuil@xs4all.nl>
Fri, 13 Mar 2015 13:41:39 +0000 (10:41 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 2 Apr 2015 21:28:59 +0000 (18:28 -0300)
Commit c5036d61e0bed3f4f51391a145638b426825e69c ("media: au0828: drop
vbi_buffer_filled() and re-use buffer_filled()") broke video and vbi streaming.

The vb2_buffer struct was copied instead of taking a pointer to it, but
vb2_buffer_done() needs the real object, not a copy, since it is hooking
the buffer into a different list.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/au0828/au0828-video.c

index bf990a931d4ef59de57f85adb7c649242273eaa0..1a362a041ab3f33061be2113a4d984be6c577245 100644 (file)
@@ -302,20 +302,20 @@ static inline void buffer_filled(struct au0828_dev *dev,
                                 struct au0828_dmaqueue *dma_q,
                                 struct au0828_buffer *buf)
 {
-       struct vb2_buffer vb = buf->vb;
-       struct vb2_queue *q = vb.vb2_queue;
+       struct vb2_buffer *vb = &buf->vb;
+       struct vb2_queue *q = vb->vb2_queue;
 
        /* Advice that buffer was filled */
        au0828_isocdbg("[%p/%d] wakeup\n", buf, buf->top_field);
 
        if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               vb.v4l2_buf.sequence = dev->frame_count++;
+               vb->v4l2_buf.sequence = dev->frame_count++;
        else
-               vb.v4l2_buf.sequence = dev->vbi_frame_count++;
+               vb->v4l2_buf.sequence = dev->vbi_frame_count++;
 
-       vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;
-       v4l2_get_timestamp(&vb.v4l2_buf.timestamp);
-       vb2_buffer_done(&vb, VB2_BUF_STATE_DONE);
+       vb->v4l2_buf.field = V4L2_FIELD_INTERLACED;
+       v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
+       vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
 }
 
 /*