Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 646bca6a authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Greg Kroah-Hartman
Browse files

media: sh_veu: Correct return type for mem2mem buffer helpers 



[ 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: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 25e68aed

drivers/media/platform/sh_veu.c

+2 −2
Original line number Diff line number Diff line
@@ -276,13 +276,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 ========== */