| From cc03a3a66fd64b0aaa19db1fe0853f4bacf89c40 Mon Sep 17 00:00:00 2001 |
| From: Alexandre Courbot <acourbot@chromium.org> |
| Date: Wed, 6 Mar 2019 01:15:02 -0500 |
| Subject: media: mtk-vcodec: fix access to vb2_v4l2_buffer struct |
| |
| [ Upstream commit 3235d3946429f64b19addfd89fc926a36eaec06a ] |
| |
| Commit 0650a91499e0 ("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: 0650a91499e0 ("media: mtk-vcodec: Correct return type for mem2mem buffer helpers") |
| |
| Signed-off-by: Alexandre Courbot <acourbot@chromium.org> |
| 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/mtk-vcodec/mtk_vcodec_dec.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c |
| index 49babf994cb75..e20b340855e76 100644 |
| --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c |
| +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c |
| @@ -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; |
| mtk_v4l2_debug(2, |
| "[%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.size); |
| |
| @@ -1182,7 +1182,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb) |
| } |
| mtk_v4l2_debug(ret ? 0 : 1, |
| "[%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); |
| return; |
| } |
| -- |
| 2.20.1 |
| |
