summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2018-12-31 19:31:54 +0530
committerVinod Koul <vkoul@kernel.org>2018-12-31 19:31:54 +0530
commit23a1bff76406070c287c8c5a0b528ae7ffd07d1a (patch)
tree6997f0e9481edffab52ba5f34f2750c9cebbc1a3 /drivers
parentb7ff66ca30f88dfd63763d12b848520baddc5ae5 (diff)
parentaf8bf89a8e0b8354576dcaa507c8f2fd4a205742 (diff)
Merge branch 'topic/imx' into for-linus
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/imx-sdma.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index d6a5d6ddfdad..6f13816cce8e 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -677,9 +677,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size,
int ret;
unsigned long flags;
- buf_virt = dma_alloc_coherent(NULL,
- size,
- &buf_phys, GFP_KERNEL);
+ buf_virt = dma_alloc_coherent(NULL, size, &buf_phys, GFP_KERNEL);
if (!buf_virt) {
return -ENOMEM;
}