---

yaml --- r: 262039 b: refs/heads/master c: 79ca7ec h: refs/heads/master i: 262037: 10243bf 262035: 75ac661 262031: 508f7cb v: v3
git-mirror · Jul 13, 2011 · e811aa1 · e811aa1
1 parent 6f65715
commit e811aa1
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: ae752bf4cb78520e42f96f904e441c50f2114c7b
+refs/heads/master: 79ca7ec3d1046a79c64f95f0cac0f5fd29829f53
diff --git a/trunk/drivers/dma/ste_dma40.c b/trunk/drivers/dma/ste_dma40.c
@@ -2112,7 +2112,7 @@ dma40_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
 	struct scatterlist *sg;
 	int i;
 
-	sg = kcalloc(periods + 1, sizeof(struct scatterlist), GFP_KERNEL);
+	sg = kcalloc(periods + 1, sizeof(struct scatterlist), GFP_NOWAIT);
 	for (i = 0; i < periods; i++) {
 		sg_dma_address(&sg[i]) = dma_addr;
 		sg_dma_len(&sg[i]) = period_len;