diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2018-11-06 03:40:25 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-13 09:16:19 +0100 |
| commit | 2f79476548d8f2e93aff4e956b7a29ebc5071eff (patch) | |
| tree | c4e3a5d1af43869f454e8af04d12c3adb83ce993 /drivers/dma | |
| parent | 37aefa0237342c9796bfe0752593a1382a9d640a (diff) | |
| download | linux-rpi3-2f79476548d8f2e93aff4e956b7a29ebc5071eff.tar.gz linux-rpi3-2f79476548d8f2e93aff4e956b7a29ebc5071eff.tar.bz2 linux-rpi3-2f79476548d8f2e93aff4e956b7a29ebc5071eff.zip | |
Revert "dmaengine: imx-sdma: Use GFP_NOWAIT for dma allocations"
commit c06abca69218ac42fa58d1ba7a7b0d9bab5f1b18 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/imx-sdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index b4ec2d20e661..3bca5e0c715f 100644 --- 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; |