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

[karo-tx-linux.git] / drivers / media / platform / sti / c8sectpfe / c8sectpfe-core.c

diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
index f922f2e827bcbb2bfe8cd0606fac89d3ec8c5bd6..8490a65ae1c6703a3e14ff57dfc792c9d354fad5 100644 (file)
--- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
+++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
@@ -1084,10 +1084,10 @@ static void load_dmem_segment(struct c8sectpfei *fei, Elf32_Phdr *phdr,
                seg_num, phdr->p_paddr, phdr->p_filesz,
                dst, phdr->p_memsz);
 
-       memcpy((void __iomem *)dst, (void *)fw->data + phdr->p_offset,
+       memcpy((void __force *)dst, (void *)fw->data + phdr->p_offset,
                phdr->p_filesz);
 
-       memset((void __iomem *)dst + phdr->p_filesz, 0,
+       memset((void __force *)dst + phdr->p_filesz, 0,
                phdr->p_memsz - phdr->p_filesz);
 }