summaryrefslogtreecommitdiff
path: root/drivers/media/platform/exynos4-is
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2018-04-18 11:06:17 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-05-05 09:01:22 -0400
commit1719834691901386cfcd264e0144309ddbada3d8 (patch)
treef918e22e14748ad7a0b98f813e301f9e09c09d3a /drivers/media/platform/exynos4-is
parentf2bea20ec56234a8ca8ec4a3481b744b3e0e8813 (diff)
media: include/media: fix missing | operator when setting cfg
The value from a readl is being masked with ITE_REG_CIOCAN_MASK however this is not being used and cfg is being re-assigned. I believe the assignment operator should actually be instead the |= operator. Detected by CoverityScan, CID#1467987 ("Unused value") Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform/exynos4-is')
-rw-r--r--drivers/media/platform/exynos4-is/fimc-lite-reg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.c b/drivers/media/platform/exynos4-is/fimc-lite-reg.c
index f0acc550d065..16565a0b4bf1 100644
--- a/drivers/media/platform/exynos4-is/fimc-lite-reg.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite-reg.c
@@ -254,7 +254,7 @@ void flite_hw_set_dma_window(struct fimc_lite *dev, struct flite_frame *f)
/* Maximum output pixel size */
cfg = readl(dev->regs + FLITE_REG_CIOCAN);
cfg &= ~FLITE_REG_CIOCAN_MASK;
- cfg = (f->f_height << 16) | f->f_width;
+ cfg |= (f->f_height << 16) | f->f_width;
writel(cfg, dev->regs + FLITE_REG_CIOCAN);
/* DMA offsets */