aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/s5p-fimc/fimc-m2m.c
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2012-04-26 06:26:29 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-20 09:23:09 -0300
commit3d112d9aced3d4ad959e159a1662503452792295 (patch)
tree389a4a1980585c316687b4cfebdb64e46a931812 /drivers/media/video/s5p-fimc/fimc-m2m.c
parent[media] s5p-fimc: Rework the video pipeline control functions (diff)
downloadlinux-dev-3d112d9aced3d4ad959e159a1662503452792295.tar.xz
linux-dev-3d112d9aced3d4ad959e159a1662503452792295.zip
[media] s5p-fimc: Prefix format enumerations with FIMC_FMT_
Prefix the pixel format enumerations with FIMC_FMT_ to make it more clear, especially when used in new IP drivers, like fimc-lite, etc. Also add IO_ prefix in the input/output enumeration. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-fimc/fimc-m2m.c')
-rw-r--r--drivers/media/video/s5p-fimc/fimc-m2m.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-m2m.c b/drivers/media/video/s5p-fimc/fimc-m2m.c
index 70edc75e6fce..60bbab157c24 100644
--- a/drivers/media/video/s5p-fimc/fimc-m2m.c
+++ b/drivers/media/video/s5p-fimc/fimc-m2m.c
@@ -676,8 +676,8 @@ static int fimc_m2m_open(struct file *file)
/* Setup the device context for memory-to-memory mode */
ctx->state = FIMC_CTX_M2M;
ctx->flags = 0;
- ctx->in_path = FIMC_DMA;
- ctx->out_path = FIMC_DMA;
+ ctx->in_path = FIMC_IO_DMA;
+ ctx->out_path = FIMC_IO_DMA;
ctx->m2m_ctx = v4l2_m2m_ctx_init(fimc->m2m.m2m_dev, ctx, queue_init);
if (IS_ERR(ctx->m2m_ctx)) {