Revert "dmaengine: imx-sdma: Use GFP_NOWAIT for dma allocations"
authorLucas Stach <l.stach@pengutronix.de>
Tue, 6 Nov 2018 03:40:25 +0000 (03:40 +0000)
committerVinod Koul <vkoul@kernel.org>
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 <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>
drivers/dma/imx-sdma.c

index b4ec2d20e66167786939ae867de0d93378ae4054..3bca5e0c715fcc496d1bf47113b2b963642e2f59 100644 (file)
@@ -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;