Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281630
b: refs/heads/master
c: 7803c7a
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Meyer authored and Kukjin Kim committed Dec 8, 2011
1 parent f6901d0 commit 878e8da
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 63b870f149cdcd253ae8da88d8b5a0b43a68965c
refs/heads/master: 7803c7aa8ef262a63e91ee0b04470715a7dc2eb0
3 changes: 1 addition & 2 deletions trunk/arch/arm/plat-s3c24xx/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 878e8da

Please sign in to comment.