[media] staging: media: davinci: vpfe: release buffers in case start_streaming call...
authorLad, Prabhakar <prabhakar.csengg@gmail.com>
Sun, 23 Mar 2014 06:37:25 +0000 (03:37 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Wed, 16 Apr 2014 21:26:47 +0000 (18:26 -0300)
this patch releases the buffer by calling vb2_buffer_done(),
with state marked as VB2_BUF_STATE_QUEUED if start_streaming()
call back fails.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/staging/media/davinci_vpfe/vpfe_video.c

index c86ab8436c99eb442f992f191c5331a67b15b6b4..9337d92c5939521329d743bde0d0fd60044db741 100644 (file)
@@ -1218,8 +1218,16 @@ static int vpfe_start_streaming(struct vb2_queue *vq, unsigned int count)
        video->state = VPFE_VIDEO_BUFFER_QUEUED;
 
        ret = vpfe_start_capture(video);
-       if (ret)
+       if (ret) {
+               struct vpfe_cap_buffer *buf, *tmp;
+
+               vb2_buffer_done(&video->cur_frm->vb, VB2_BUF_STATE_QUEUED);
+               list_for_each_entry_safe(buf, tmp, &video->dma_queue, list) {
+                       list_del(&buf->list);
+                       vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+               }
                goto unlock_out;
+       }
 
        mutex_unlock(&video->lock);