Commit 70bf8e42 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Greg Kroah-Hartman

media: mtk-vcodec: fix access to vb2_v4l2_buffer struct

[ Upstream commit 3235d394 ]

Commit 0650a914 ("media: mtk-vcodec: Correct return type for mem2mem
buffer helpers") fixed the return types for mem2mem buffer helper
functions, but omitted two occurrences that are accessed in the
mtk_v4l2_debug() macro. These only trigger compiler errors when DEBUG is
defined.

Fixes: 0650a914 ("media: mtk-vcodec: Correct return type for mem2mem buffer helpers")
Signed-off-by: default avatarAlexandre Courbot <acourbot@chromium.org>
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 1fef8fe9
...@@ -1158,7 +1158,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb) ...@@ -1158,7 +1158,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)
src_mem.size = (size_t)src_buf->vb2_buf.planes[0].bytesused; src_mem.size = (size_t)src_buf->vb2_buf.planes[0].bytesused;
mtk_v4l2_debug(2, mtk_v4l2_debug(2,
"[%d] buf id=%d va=%p dma=%pad size=%zx", "[%d] buf id=%d va=%p dma=%pad size=%zx",
ctx->id, src_buf->index, ctx->id, src_buf->vb2_buf.index,
src_mem.va, &src_mem.dma_addr, src_mem.va, &src_mem.dma_addr,
src_mem.size); src_mem.size);
...@@ -1182,7 +1182,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb) ...@@ -1182,7 +1182,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)
} }
mtk_v4l2_debug(ret ? 0 : 1, mtk_v4l2_debug(ret ? 0 : 1,
"[%d] vdec_if_decode() src_buf=%d, size=%zu, fail=%d, res_chg=%d", "[%d] vdec_if_decode() src_buf=%d, size=%zu, fail=%d, res_chg=%d",
ctx->id, src_buf->index, ctx->id, src_buf->vb2_buf.index,
src_mem.size, ret, res_chg); src_mem.size, ret, res_chg);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment