lkml.org 
[lkml]   [2019]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 113/246] media: sh_veu: Correct return type for mem2mem buffer helpers
    Date
    5.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 43c145195c7fc3025ee7ecfc67112ac1c82af7c2 ]

    Fix the assigned type of mem2mem buffer handling API.
    Namely, these functions:

    v4l2_m2m_next_buf
    v4l2_m2m_last_buf
    v4l2_m2m_buf_remove
    v4l2_m2m_next_src_buf
    v4l2_m2m_next_dst_buf
    v4l2_m2m_last_src_buf
    v4l2_m2m_last_dst_buf
    v4l2_m2m_src_buf_remove
    v4l2_m2m_dst_buf_remove

    return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.

    Fixing this is necessary to fix the mem2mem buffer handling API,
    changing the return to the correct struct vb2_v4l2_buffer instead
    of a void pointer.

    Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/sh_veu.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
    index 09ae64a0004c..d277cc674349 100644
    --- a/drivers/media/platform/sh_veu.c
    +++ b/drivers/media/platform/sh_veu.c
    @@ -273,13 +273,13 @@ static void sh_veu_process(struct sh_veu_dev *veu,
    static void sh_veu_device_run(void *priv)
    {
    struct sh_veu_dev *veu = priv;
    - struct vb2_buffer *src_buf, *dst_buf;
    + struct vb2_v4l2_buffer *src_buf, *dst_buf;

    src_buf = v4l2_m2m_next_src_buf(veu->m2m_ctx);
    dst_buf = v4l2_m2m_next_dst_buf(veu->m2m_ctx);

    if (src_buf && dst_buf)
    - sh_veu_process(veu, src_buf, dst_buf);
    + sh_veu_process(veu, &src_buf->vb2_buf, &dst_buf->vb2_buf);
    }

    /* ========== video ioctls ========== */
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-04-04 11:26    [W:4.381 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site