---

yaml --- r: 374616 b: refs/heads/master c: 5c1ef59 h: refs/heads/master v: v3
git-mirror · Apr 15, 2013 · 39ae128 · 39ae128
1 parent 1c14a6d
commit 39ae128
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: 30fb980b99d3896bd891e56fec22191d40007efc
+refs/heads/master: 5c1ef59168c485318e40ba485c1eba57d81d0faa
diff --git a/trunk/drivers/dma/pch_dma.c b/trunk/drivers/dma/pch_dma.c
@@ -476,7 +476,7 @@ static struct pch_dma_desc *pdc_desc_get(struct pch_dma_chan *pd_chan)
 	dev_dbg(chan2dev(&pd_chan->chan), "scanned %d descriptors\n", i);
 
 	if (!ret) {
-		ret = pdc_alloc_desc(&pd_chan->chan, GFP_NOIO);
+		ret = pdc_alloc_desc(&pd_chan->chan, GFP_ATOMIC);
 		if (ret) {
 			spin_lock(&pd_chan->lock);
 			pd_chan->descs_allocated++;