diff options
| author | Jassi <jassi.brar@samsung.com> | 2009-09-15 19:01:20 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-09-16 00:50:06 +0100 |
| commit | b93011e72c1476b08ff62977ecf648080ba38c1a (patch) | |
| tree | 2eaa28a62f1cbfa236ec8f9583ba87e31847548e /arch/arm/plat-s3c64xx | |
| parent | 3ea61e49223c499c705b80ea385cb4df9c08da21 (diff) | |
| download | linux-b93011e72c1476b08ff62977ecf648080ba38c1a.tar.gz linux-b93011e72c1476b08ff62977ecf648080ba38c1a.tar.bz2 linux-b93011e72c1476b08ff62977ecf648080ba38c1a.zip | |
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: Jassi <jassi.brar@samsung.com>
[ben-linux@fluff.org: Minor description edit and re-wrap]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c64xx')
| -rw-r--r-- | arch/arm/plat-s3c64xx/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c64xx/dma.c b/arch/arm/plat-s3c64xx/dma.c index b26d2a242d9e..266a10745a85 100644 --- a/arch/arm/plat-s3c64xx/dma.c +++ b/arch/arm/plat-s3c64xx/dma.c @@ -345,13 +345,13 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id, if (!chan) return -EINVAL; - buff = kzalloc(sizeof(struct s3c64xx_dma_buff), GFP_KERNEL); + buff = kzalloc(sizeof(struct s3c64xx_dma_buff), GFP_ATOMIC); if (!buff) { printk(KERN_ERR "%s: no memory for buffer\n", __func__); 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) { printk(KERN_ERR "%s: no memory for lli\n", __func__); ret = -ENOMEM; |