lkml.org 
[lkml]   [2019]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch v3 18/20] media: ti-vpe: cal: Fix a WARN issued when start streaming fails
    Date
    When start_streaming fails after the buffers have been queued we have to
    make sure all buffers are returned to user-space properly otherwise a
    v4l2 level WARN is generated.

    Signed-off-by: Benoit Parrot <bparrot@ti.com>
    ---
    drivers/media/platform/ti-vpe/cal.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
    index 091119bee8fc..92a54d59d433 100644
    --- a/drivers/media/platform/ti-vpe/cal.c
    +++ b/drivers/media/platform/ti-vpe/cal.c
    @@ -1695,10 +1695,15 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)
    return 0;

    err:
    + spin_lock_irqsave(&ctx->slock, flags);
    + vb2_buffer_done(&ctx->cur_frm->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
    + ctx->cur_frm = NULL;
    + ctx->next_frm = NULL;
    list_for_each_entry_safe(buf, tmp, &dma_q->active, list) {
    list_del(&buf->list);
    vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
    }
    + spin_unlock_irqrestore(&ctx->slock, flags);
    return ret;
    }

    --
    2.17.1
    \
     
     \ /
      Last update: 2019-11-12 15:29    [W:3.222 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site