Merge branch 'topic/imx' into for-linus

23a1bff7 · Vinod Koul · b7ff66ca · af8bf89a · 23a1bff7
Commit 23a1bff7 authored Dec 31, 2018 by Vinod Koul
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

drivers/dma/imx-sdma.c drivers/dma/imx-sdma.c +1 -3

No files found.
--- 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,
+	buf_virt = dma_alloc_coherent(NULL, size, &buf_phys, GFP_KERNEL);
-			size,
-			&buf_phys, GFP_KERNEL);
 	if (!buf_virt) {
 		return -ENOMEM;
 	}