summaryrefslogtreecommitdiff
path: root/drivers/media/platform/rockchip/rga/rga.c
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel@collabora.com>2019-02-08 19:17:43 +0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-02-18 23:30:25 +0300
commitda2d3a4e4adabc6ccfb100bc9abd58ee9cd6c4b7 (patch)
tree8ef7b23589dbbc74be33883d9cee2c876fd7e615 /drivers/media/platform/rockchip/rga/rga.c
parent8d20dcefe471763f23ad538369ec65b51993ffff (diff)
downloadlinux-da2d3a4e4adabc6ccfb100bc9abd58ee9cd6c4b7.tar.xz
media: rockchip/rga: Correct return type for mem2mem buffer helpers
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>
Diffstat (limited to 'drivers/media/platform/rockchip/rga/rga.c')
-rw-r--r--drivers/media/platform/rockchip/rga/rga.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 5c653287185f..b096227a9722 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -43,7 +43,7 @@ static void device_run(void *prv)
{
struct rga_ctx *ctx = prv;
struct rockchip_rga *rga = ctx->rga;
- struct vb2_buffer *src, *dst;
+ struct vb2_v4l2_buffer *src, *dst;
unsigned long flags;
spin_lock_irqsave(&rga->ctrl_lock, flags);
@@ -53,8 +53,8 @@ static void device_run(void *prv)
src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
- rga_buf_map(src);
- rga_buf_map(dst);
+ rga_buf_map(&src->vb2_buf);
+ rga_buf_map(&dst->vb2_buf);
rga_hw_start(rga);