diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-06 12:42:25 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-06 12:42:25 -0800 |
| commit | 54b6c82ac9a124804816f244f587c0f40d25ad01 (patch) | |
| tree | ccc18e9d71bb1b9dc1a69a2ba7ff18d8e376f7b3 /arch/arm/plat-s3c24xx | |
| parent | ae852749438df6cb2c3ea0a015863010ecd3be0d (diff) | |
| parent | 65db039bf7402f0a5b19cbf6dcff55ebea433b8b (diff) | |
| download | talos-op-linux-54b6c82ac9a124804816f244f587c0f40d25ad01.tar.gz talos-op-linux-54b6c82ac9a124804816f244f587c0f40d25ad01.zip | |
Merge branch 'samsung/cleanup' into next/cleanup2
* samsung/cleanup:
ARM: EXYNOS: Use gpio_request_one
ARM: S5PV210: Use gpio_request_one
ARM: SAMSUNG: Use kmemdup rather than duplicating its implementation
ARM: EXYNOS: remove exynos4_scu_enable()
Diffstat (limited to 'arch/arm/plat-s3c24xx')
| -rw-r--r-- | arch/arm/plat-s3c24xx/dma.c | 3 |
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; |
