summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2018-07-02 18:37:27 +0530
committerVinod Koul <vkoul@kernel.org>2018-07-02 18:37:27 +0530
commitc1199875d327a9b3bbb3fb1cca0d467d3e625fbb (patch)
tree99417c3ed141db6e7fe78905cc7b571067bd76bb /drivers/dma
parent680302c47513f727063031f7ec4fcac0316241eb (diff)
downloadlinux-stable-c1199875d327a9b3bbb3fb1cca0d467d3e625fbb.tar.gz
linux-stable-c1199875d327a9b3bbb3fb1cca0d467d3e625fbb.tar.bz2
linux-stable-c1199875d327a9b3bbb3fb1cca0d467d3e625fbb.zip
dmaengine: imx-sdma: Use GFP_NOWAIT for dma allocations
The memory allocation in DMA callbacks should use GFP_NOWAIT, so update this one and fix code alignment for this call while at it. Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/imx-sdma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index d650065f42dd..dfd1fbbe7ba8 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1157,8 +1157,8 @@ static int sdma_alloc_bd(struct sdma_desc *desc)
{
int ret = 0;
- desc->bd = dma_pool_alloc(desc->sdmac->bd_pool, GFP_ATOMIC,
- &desc->bd_phys);
+ desc->bd = dma_pool_alloc(desc->sdmac->bd_pool, GFP_NOWAIT,
+ &desc->bd_phys);
if (!desc->bd) {
ret = -ENOMEM;
goto out;