aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-09-19 07:16:23 -0400
committerDan Williams <dan.j.williams@intel.com>2008-09-19 07:16:23 -0400
commit6fdb8bd47111d3f94be221082b725ec2dec1d5c7 (patch)
tree5a63f297bfa423f31c06e9d8d70c7efd6761a79a /drivers/dma
parent6b3141962dc82cfe1c30afdf91d564b309859cbe (diff)
drivers/dma/dmatest.c: switch a GFP_ATOMIC to GFP_KERNEL
It was needlessly using the unreliable GFP_ATOMIC. Cc: Timur Tabi <timur@freescale.com> Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/dmatest.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index 422500c6c163..d1e381e35a9e 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -330,7 +330,7 @@ static enum dma_state_client dmatest_add_channel(struct dma_chan *chan)
330 if (dtc->chan == chan) 330 if (dtc->chan == chan)
331 return DMA_DUP; 331 return DMA_DUP;
332 332
333 dtc = kmalloc(sizeof(struct dmatest_chan), GFP_ATOMIC); 333 dtc = kmalloc(sizeof(struct dmatest_chan), GFP_KERNEL);
334 if (!dtc) { 334 if (!dtc) {
335 pr_warning("dmatest: No memory for %s\n", chan->dev.bus_id); 335 pr_warning("dmatest: No memory for %s\n", chan->dev.bus_id);
336 return DMA_NAK; 336 return DMA_NAK;