upstream: [media] media: davinci: vpbe: release buffers in case start_streaming call...

this patch adds support to release 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>

diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index 4025b1b..bf5eff9 100644 (file)
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -355,8 +355,17 @@ static int vpbe_start_streaming(struct vb2_queue *vq, unsigned int count)
 
        /* Set parameters in OSD and VENC */
        ret = vpbe_set_osd_display_params(fh->disp_dev, layer);
-       if (ret < 0)
+       if (ret < 0) {
+               struct vpbe_disp_buffer *buf, *tmp;
+
+               vb2_buffer_done(&layer->cur_frm->vb, VB2_BUF_STATE_QUEUED);
+               list_for_each_entry_safe(buf, tmp, &layer->dma_queue, list) {
+                       list_del(&buf->list);
+                       vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+               }
+
                return ret;
+       }
 
        /*
         * if request format is yuv420 semiplanar, need to