Commit b93011e7 authored by Jassi's avatar Jassi Committed by Ben Dooks

ARM: S3C64XX: DMA: Debugged alloc's with GFP_KERNEL flag in Intr context.

s3c2410_dma_enqueue makes call to kzalloc and dma_pool_alloc with GFP_KERNEL
flag set, this can be an issue for drivers, like I2S, which call
s3c2410_dma_enqueue from dma-bufferdone callback.

Change the flag GFP_KERNEL to GFP_ATOMIC to avoid any problems.
Signed-Off-by: default avatarJassi <jassi.brar@samsung.com>
[ben-linux@fluff.org: Minor description edit and re-wrap]
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 3ea61e49
...@@ -345,13 +345,13 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id, ...@@ -345,13 +345,13 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
if (!chan) if (!chan)
return -EINVAL; return -EINVAL;
buff = kzalloc(sizeof(struct s3c64xx_dma_buff), GFP_KERNEL); buff = kzalloc(sizeof(struct s3c64xx_dma_buff), GFP_ATOMIC);
if (!buff) { if (!buff) {
printk(KERN_ERR "%s: no memory for buffer\n", __func__); printk(KERN_ERR "%s: no memory for buffer\n", __func__);
return -ENOMEM; return -ENOMEM;
} }
lli = dma_pool_alloc(dma_pool, GFP_KERNEL, &buff->lli_dma); lli = dma_pool_alloc(dma_pool, GFP_ATOMIC, &buff->lli_dma);
if (!lli) { if (!lli) {
printk(KERN_ERR "%s: no memory for lli\n", __func__); printk(KERN_ERR "%s: no memory for lli\n", __func__);
ret = -ENOMEM; ret = -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment