]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: v4l: sh_mobile_ceu: Return buffers on streamoff()
authorJacopo Mondi <jacopo+renesas@jmondi.org>
Wed, 15 Nov 2017 17:59:12 +0000 (12:59 -0500)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 18 Dec 2017 19:57:25 +0000 (14:57 -0500)
videobuf2 core reports an error when not all buffers have been returned
to the framework:

drivers/media/v4l2-core/videobuf2-core.c:1651
WARN_ON(atomic_read(&q->owned_by_drv_count))

Fix this returning all buffers currently in capture queue.

Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c

index 36762ec954e7e3f3f00d1f9bacd807294edecd84..9180a1d96acbabff6ef19082a0717b5ae95df843 100644 (file)
@@ -451,13 +451,18 @@ static void sh_mobile_ceu_stop_streaming(struct vb2_queue *q)
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
        struct list_head *buf_head, *tmp;
+       struct vb2_v4l2_buffer *vbuf;
 
        spin_lock_irq(&pcdev->lock);
 
        pcdev->active = NULL;
 
-       list_for_each_safe(buf_head, tmp, &pcdev->capture)
+       list_for_each_safe(buf_head, tmp, &pcdev->capture) {
+               vbuf = &list_entry(buf_head, struct sh_mobile_ceu_buffer,
+                                  queue)->vb;
+               vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_DONE);
                list_del_init(buf_head);
+       }
 
        spin_unlock_irq(&pcdev->lock);