projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/big.LITTLE' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
dma
/
pch_dma.c
diff --git
a/drivers/dma/pch_dma.c
b/drivers/dma/pch_dma.c
index d01faeb0f27c15ee9a55e78d257caf58136ff8d9..ce3dc3e9688c86ea30e3be7757094b78749a6ec9 100644
(file)
--- a/
drivers/dma/pch_dma.c
+++ b/
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++;