Commit 23a1bff7 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/imx' into for-linus

parents b7ff66ca af8bf89a

drivers/dma/imx-sdma.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

	}