---

yaml --- r: 116295 b: refs/heads/master c: 6fdb8bd h: refs/heads/master i: 116293: e40aef2 116291: 4b2cff5 116287: ce40a85 v: v3
git-mirror · Sep 19, 2008 · d5f4f5f · d5f4f5f
1 parent 7ce6eb5
commit d5f4f5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b3141962dc82cfe1c30afdf91d564b309859cbe
+refs/heads/master: 6fdb8bd47111d3f94be221082b725ec2dec1d5c7
diff --git a/trunk/drivers/dma/dmatest.c b/trunk/drivers/dma/dmatest.c
@@ -330,7 +330,7 @@ static enum dma_state_client dmatest_add_channel(struct dma_chan *chan)
 		if (dtc->chan == chan)
 			return DMA_DUP;
 
-	dtc = kmalloc(sizeof(struct dmatest_chan), GFP_ATOMIC);
+	dtc = kmalloc(sizeof(struct dmatest_chan), GFP_KERNEL);
 	if (!dtc) {
 		pr_warning("dmatest: No memory for %s\n", chan->dev.bus_id);
 		return DMA_NAK;