diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-04-02 06:41:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 09:27:16 -0300 |
| commit | 9448ab7dec30489d5318f786d0faee08354ef3d5 (patch) | |
| tree | 0b77b5beed4edce688b12ba5cddbd82f0e0dd1a7 /drivers/media/video/s5p-fimc/fimc-m2m.c | |
| parent | 0c9204d3427015a22fa90b865b6317fed337810b (diff) | |
| download | blackbird-op-linux-9448ab7dec30489d5318f786d0faee08354ef3d5.tar.gz blackbird-op-linux-9448ab7dec30489d5318f786d0faee08354ef3d5.zip | |
[media] s5p-fimc: Add color effect control
Add support for V4L2_CID_COLORFX control at the mem-to-mem and capture
video nodes.
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.c | 4 |
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 3de22b0db66f..4c58e0570962 100644 --- a/drivers/media/video/s5p-fimc/fimc-m2m.c +++ b/drivers/media/video/s5p-fimc/fimc-m2m.c @@ -150,7 +150,7 @@ static void fimc_device_run(void *priv) fimc_hw_set_mainscaler(ctx); fimc_hw_set_target_format(ctx); fimc_hw_set_rotation(ctx); - fimc_hw_set_effect(ctx, false); + fimc_hw_set_effect(ctx); fimc_hw_set_out_dma(ctx); if (fimc->variant->has_alpha) fimc_hw_set_rgb_alpha(ctx); @@ -669,7 +669,7 @@ static int fimc_m2m_open(struct file *file) goto error_fh; /* Use separate control handler per file handle */ - ctx->fh.ctrl_handler = &ctx->ctrl_handler; + ctx->fh.ctrl_handler = &ctx->ctrls.handler; file->private_data = &ctx->fh; v4l2_fh_add(&ctx->fh); |
