Skip to content

Commit

Permalink
Merge branch 'topic/imx' into for-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
vinodkoul committed Dec 31, 2018
2 parents b7ff66c + af8bf89 commit 23a1bff
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/dma/imx-sdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 23a1bff

Please sign in to comment.