projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2595646
)
Revert "dmaengine: imx-sdma: Use GFP_NOWAIT for dma allocations"
author
Lucas Stach
<
[email protected]
>
Tue, 6 Nov 2018 03:40:25 +0000
(
03:40
+0000)
committer
Vinod Koul
<
[email protected]
>
Wed, 5 Dec 2018 08:19:44 +0000
(13:49 +0530)
This reverts commit
c1199875d327
, as this depends on another commit
that is going to be reverted.
Signed-off-by: Lucas Stach <
[email protected]
>
Signed-off-by: Robin Gong <
[email protected]
>
Cc: stable <
[email protected]
>
Signed-off-by: Vinod Koul <
[email protected]
>
drivers/dma/imx-sdma.c
patch
|
blob
|
history
diff --git
a/drivers/dma/imx-sdma.c
b/drivers/dma/imx-sdma.c
index b4ec2d20e66167786939ae867de0d93378ae4054..3bca5e0c715fcc496d1bf47113b2b963642e2f59 100644
(file)
--- a/
drivers/dma/imx-sdma.c
+++ b/
drivers/dma/imx-sdma.c
@@
-1194,8
+1194,8
@@
static int sdma_alloc_bd(struct sdma_desc *desc)
{
int ret = 0;
- desc->bd = dma_pool_alloc(desc->sdmac->bd_pool, GFP_
NOWAIT
,
- &desc->bd_phys);
+ desc->bd = dma_pool_alloc(desc->sdmac->bd_pool, GFP_
ATOMIC
,
+
&desc->bd_phys);
if (!desc->bd) {
ret = -ENOMEM;
goto out;