Merge remote-tracking branch 'v4l-dvb/master'

[karo-tx-linux.git] / drivers / media / platform / exynos4-is / mipi-csis.c

diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index d74e1bec3d867b608c4c6a70039c484b833f6599..4b85105dc159b736f37b6c44fe769298e141140d 100644 (file)
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -706,7 +706,8 @@ static irqreturn_t s5pcsis_irq_handler(int irq, void *dev_id)
                else
                        offset = S5PCSIS_PKTDATA_ODD;
 
-               memcpy(pktbuf->data, state->regs + offset, pktbuf->len);
+               memcpy(pktbuf->data, (u8 __force *)state->regs + offset,
+                      pktbuf->len);
                pktbuf->data = NULL;
                rmb();
        }