diff options
author | Maxime Ripard | 2019-02-19 11:17:05 +0100 |
---|---|---|
committer | Maxime Ripard | 2019-02-19 11:17:05 +0100 |
commit | ae6ba10d5090fc7e9095eaef3dcf06ba016725a6 (patch) | |
tree | e631eaa2df52712783acc4d757841da4890c4143 /drivers/spi | |
parent | drm: Remove set but not used variable 'gem' (diff) | |
parent | Merge v5.0-rc7 into drm-next (diff) | |
download | kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.gz kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.xz kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.zip |
Merge drm/drm-next into drm-misc-next
Backmerge drm-next to bring in -rc7
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'drivers/spi')
-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; |