openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "dmaengine: imx-sdma: Use GFP_NOWAIT for dma allocations" 

This reverts commit c1199875d3, as this depends on another commit
that is going to be reverted.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Lucas Stach 2018-11-06 03:40:25 +00:00 committed by Vinod Koul
parent 2595646791
commit c06abca692
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dma/imx-sdma.c
View File

@ -1194,8 +1194,8 @@ static int sdma_alloc_bd(struct sdma_desc *desc)
{ {
int ret = 0; int ret = 0;
desc->bd = dma_pool_alloc(desc->sdmac->bd_pool, GFP_NOWAIT, desc->bd = dma_pool_alloc(desc->sdmac->bd_pool, GFP_ATOMIC,
&desc->bd_phys); &desc->bd_phys);
if (!desc->bd) { if (!desc->bd) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;