summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2014-09-01 13:05:51 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-11-18 03:01:15 (GMT)
commit0367e8971165281ec26ea94e8cc564b1345483cf (patch)
tree68bbf40ad79669d92a44231611df795bac3250fb
parent61c3f19d19b3b622d2ab68f720fa773483ee7467 (diff)
downloadlinux-3.10-0367e8971165281ec26ea94e8cc564b1345483cf.zip
linux-3.10-0367e8971165281ec26ea94e8cc564b1345483cf.tar.gz
linux-3.10-0367e8971165281ec26ea94e8cc564b1345483cf.tar.bz2
[media] s5p-jpeg: avoid overwriting JPEG_CNTL register settings
Take into account the JPEG_CNTL register value read before setting SYS_INT_EN bit field. Change-Id: I76b622f01be6747ea2ad95e63fb305377b0f540b 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c b/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
index 2de81c7..d9ce40f 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
@@ -193,9 +193,9 @@ void exynos4_jpeg_set_sys_int_enable(void __iomem *base, int value)
reg = readl(base + EXYNOS4_JPEG_CNTL_REG) & ~(EXYNOS4_SYS_INT_EN);
if (value == 1)
- writel(EXYNOS4_SYS_INT_EN, base + EXYNOS4_JPEG_CNTL_REG);
+ writel(reg | EXYNOS4_SYS_INT_EN, base + EXYNOS4_JPEG_CNTL_REG);
else
- writel(~EXYNOS4_SYS_INT_EN, base + EXYNOS4_JPEG_CNTL_REG);
+ writel(reg & ~EXYNOS4_SYS_INT_EN, base + EXYNOS4_JPEG_CNTL_REG);
}
void exynos4_jpeg_set_stream_buf_address(void __iomem *base,