summaryrefslogtreecommitdiffstats
path: root/drivers/dma/sun4i-dma.c
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2020-02-14 05:46:09 +0100
committerVinod Koul <vkoul@kernel.org>2020-02-17 07:51:08 +0100
commit8faa77332fe01a681ef3097581a37b82adc1c14b (patch)
tree7e15105c6a04ab9b48f24c60b826b420ff3ea869 /drivers/dma/sun4i-dma.c
parentdmaengine: ti: dma-crossbar: convert to devm_platform_ioremap_resource() (diff)
downloadlinux-8faa77332fe01a681ef3097581a37b82adc1c14b.tar.xz
linux-8faa77332fe01a681ef3097581a37b82adc1c14b.zip
dmaengine: sun4i: set the linear_mode properly
Commit 6ebb827f7aad ("dmaengine: sun4i: use 'linear_mode' in sun4i_dma_prep_dma_cyclic") updated the condition but introduced a semi colon this making this statement have no effect, so add the bitwise OR to fix it" Fixes: 6ebb827f7aad ("dmaengine: sun4i: use 'linear_mode' in sun4i_dma_prep_dma_cyclic") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Link: https://lore.kernel.org/r/20200214044609.2215861-1-vkoul@kernel.org Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma/sun4i-dma.c')
-rw-r--r--drivers/dma/sun4i-dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/sun4i-dma.c b/drivers/dma/sun4i-dma.c
index e87fc7c460dd..e7ff09a5031d 100644
--- a/drivers/dma/sun4i-dma.c
+++ b/drivers/dma/sun4i-dma.c
@@ -697,7 +697,7 @@ sun4i_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf, size_t len,
dest = sconfig->dst_addr;
endpoints = SUN4I_DMA_CFG_DST_DRQ_TYPE(vchan->endpoint) |
SUN4I_DMA_CFG_DST_ADDR_MODE(io_mode) |
- SUN4I_DMA_CFG_SRC_DRQ_TYPE(ram_type);
+ SUN4I_DMA_CFG_SRC_DRQ_TYPE(ram_type) |
SUN4I_DMA_CFG_SRC_ADDR_MODE(linear_mode);
} else {
src = sconfig->src_addr;