Merge branch 'topic/imx' into for-linus

This commit is contained in:
Vinod Koul 2018-12-31 19:31:54 +05:30
commit 23a1bff764

View file

@ -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;
}