diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-02-18 13:27:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-02-18 13:27:15 +1000 |
| commit | c06de56121e3ac0f0f1f4a081c041654ffcacd62 (patch) | |
| tree | 3662e7052352b0f1b78e8832b1d3b91ca211b798 /drivers/spi/spi-pic32-sqi.c | |
| parent | 8d451a4b6e9f4b52ae3d4cafe17486d8d0c6afb0 (diff) | |
| parent | a3b22b9f11d9fbc48b0291ea92259a5a810e9438 (diff) | |
| download | kernel_replicant_linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.tar.gz kernel_replicant_linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.tar.bz2 kernel_replicant_linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.zip | |
Merge v5.0-rc7 into drm-next
Backmerging for nouveau and imx that needed some fixes for next pulls.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/spi/spi-pic32-sqi.c')
| -rw-r--r-- | drivers/spi/spi-pic32-sqi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-pic32-sqi.c b/drivers/spi/spi-pic32-sqi.c index d7e4e18ec3df..1ae9af5f17ec 100644 --- a/drivers/spi/spi-pic32-sqi.c +++ b/drivers/spi/spi-pic32-sqi.c @@ -466,9 +466,9 @@ static int ring_desc_ring_alloc(struct pic32_sqi *sqi) int i; /* allocate coherent DMAable memory for hardware buffer descriptors. */ - sqi->bd = dma_zalloc_coherent(&sqi->master->dev, - sizeof(*bd) * PESQI_BD_COUNT, - &sqi->bd_dma, GFP_KERNEL); + sqi->bd = dma_alloc_coherent(&sqi->master->dev, + sizeof(*bd) * PESQI_BD_COUNT, + &sqi->bd_dma, GFP_KERNEL); if (!sqi->bd) { dev_err(&sqi->master->dev, "failed allocating dma buffer\n"); return -ENOMEM; |