aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2014-09-01 10:05:52 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-03 09:08:34 -0300
commit5da74fc66b58a943e32e8c8b59e8e7c719ab611b (patch)
tree786a0ca43f9a0f043fc4087eb6c1680da0a12696
parent[media] s5p-jpeg: avoid overwriting JPEG_CNTL register settings (diff)
downloadlinux-dev-5da74fc66b58a943e32e8c8b59e8e7c719ab611b.tar.xz
linux-dev-5da74fc66b58a943e32e8c8b59e8e7c719ab611b.zip
[media] s5p-jpeg: fix HUF_TBL_EN bit clearing path
Use proper bitwise operator while clearing HUF_TBL_EN bit. Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c b/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
index d9ce40f8fbb0..e51c078360f5 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
@@ -182,7 +182,7 @@ void exynos4_jpeg_set_huf_table_enable(void __iomem *base, int value)
writel(reg | EXYNOS4_HUF_TBL_EN,
base + EXYNOS4_JPEG_CNTL_REG);
else
- writel(reg | ~EXYNOS4_HUF_TBL_EN,
+ writel(reg & ~EXYNOS4_HUF_TBL_EN,
base + EXYNOS4_JPEG_CNTL_REG);
}