diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-04-02 11:41:22 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 14:27:16 +0200 |
| commit | 9448ab7dec30489d5318f786d0faee08354ef3d5 (patch) | |
| tree | 0b77b5beed4edce688b12ba5cddbd82f0e0dd1a7 /drivers/media/video/s5p-fimc/fimc-reg.c | |
| parent | [media] s5p-fimc: Update copyright notices (diff) | |
| download | linux-9448ab7dec30489d5318f786d0faee08354ef3d5.tar.xz 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-reg.c')
| -rw-r--r-- | drivers/media/video/s5p-fimc/fimc-reg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c index 78c95d7ddde7..1fc4ce8446f5 100644 --- a/drivers/media/video/s5p-fimc/fimc-reg.c +++ b/drivers/media/video/s5p-fimc/fimc-reg.c @@ -368,13 +368,13 @@ void fimc_hw_en_capture(struct fimc_ctx *ctx) writel(cfg, dev->regs + FIMC_REG_CIIMGCPT); } -void fimc_hw_set_effect(struct fimc_ctx *ctx, bool active) +void fimc_hw_set_effect(struct fimc_ctx *ctx) { struct fimc_dev *dev = ctx->fimc_dev; struct fimc_effect *effect = &ctx->effect; u32 cfg = 0; - if (active) { + if (effect->type != FIMC_REG_CIIMGEFF_FIN_BYPASS) { cfg |= FIMC_REG_CIIMGEFF_IE_SC_AFTER | FIMC_REG_CIIMGEFF_IE_ENABLE; cfg |= effect->type; |