summaryrefslogtreecommitdiff
path: root/arch/arm/plat-s3c24xx
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-01-06 12:31:41 -0800
committerOlof Johansson <olof@lixom.net>2012-01-06 12:31:41 -0800
commit65db039bf7402f0a5b19cbf6dcff55ebea433b8b (patch)
treeccc18e9d71bb1b9dc1a69a2ba7ff18d8e376f7b3 /arch/arm/plat-s3c24xx
parent8a44930a11de8d66f92145fd2d2464ab4fba696b (diff)
parent321655efad26e03141b0bbfcfa9875056c1acb65 (diff)
downloadlinux-65db039bf7402f0a5b19cbf6dcff55ebea433b8b.tar.gz
Merge branch 'next-samsung-cleanup-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/cleanup
Diffstat (limited to 'arch/arm/plat-s3c24xx')
-rw-r--r--arch/arm/plat-s3c24xx/dma.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 53754bcf15a7..9fe35348e03b 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1437,11 +1437,10 @@ int __init s3c24xx_dma_init_map(struct s3c24xx_dma_selection *sel)
size_t map_sz = sizeof(*nmap) * sel->map_size;
int ptr;
- nmap = kmalloc(map_sz, GFP_KERNEL);
+ nmap = kmemdup(sel->map, map_sz, GFP_KERNEL);
if (nmap == NULL)
return -ENOMEM;
- memcpy(nmap, sel->map, map_sz);
memcpy(&dma_sel, sel, sizeof(*sel));
dma_sel.map = nmap;