lkml.org 
[lkml]   [2014]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/4] [media] solo6x10: free vb2 buffers on stop_streaming
    Date
    This fixes warning from drivers/media/v4l2-core/videobuf2-core.c:2144

    Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
    ---
    drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 12 +++++++++++-
    1 file changed, 11 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
    index 28023f9..6cd6a25 100644
    --- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
    +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
    @@ -781,9 +781,19 @@ static int solo_enc_start_streaming(struct vb2_queue *q, unsigned int count)
    static void solo_enc_stop_streaming(struct vb2_queue *q)
    {
    struct solo_enc_dev *solo_enc = vb2_get_drv_priv(q);
    + unsigned long flags;

    + spin_lock_irqsave(&solo_enc->av_lock, flags);
    solo_enc_off(solo_enc);
    - INIT_LIST_HEAD(&solo_enc->vidq_active);
    + while (!list_empty(&solo_enc->vidq_active)) {
    + struct solo_vb2_buf *buf = list_entry(
    + solo_enc->vidq_active.next,
    + struct solo_vb2_buf, list);
    +
    + list_del(&buf->list);
    + vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
    + }
    + spin_unlock_irqrestore(&solo_enc->av_lock, flags);
    solo_ring_stop(solo_enc->solo_dev);
    }

    --
    1.8.5.5


    \
     
     \ /
      Last update: 2014-10-29 17:21    [W:3.068 / U:0.480 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site