From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 Feb 2019 04:44:40 +0000 (+1100)
Subject: Merge remote-tracking branch 'slave-dma/next'
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=3cd0aa6a078c672e41b80308f27b4752364d2d36;p=linux

Merge remote-tracking branch 'slave-dma/next'
---

3cd0aa6a078c672e41b80308f27b4752364d2d36
diff --cc drivers/dma/imx-sdma.c
index 86708fb9bda1,af14a8d6efa8..12e03a9922f4
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@@ -1182,8 -1189,8 +1189,8 @@@ static int sdma_request_channel0(struc
  {
  	int ret = -EBUSY;
  
- 	sdma->bd0 = dma_alloc_coherent(NULL, PAGE_SIZE, &sdma->bd0_phys,
 -	sdma->bd0 = dma_zalloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys,
 -					GFP_NOWAIT);
++	sdma->bd0 = dma_alloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys,
 +				       GFP_NOWAIT);
  	if (!sdma->bd0) {
  		ret = -ENOMEM;
  		goto out;
@@@ -1205,8 -1212,8 +1212,8 @@@ static int sdma_alloc_bd(struct sdma_de
  	u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor);
  	int ret = 0;
  
- 	desc->bd = dma_alloc_coherent(NULL, bd_size, &desc->bd_phys,
- 				      GFP_NOWAIT);
 -	desc->bd = dma_zalloc_coherent(desc->sdmac->sdma->dev, bd_size,
 -				       &desc->bd_phys, GFP_NOWAIT);
++	desc->bd = dma_alloc_coherent(desc->sdmac->sdma->dev, bd_size,
++				      &desc->bd_phys, GFP_NOWAIT);
  	if (!desc->bd) {
  		ret = -ENOMEM;
  		goto out;