dmaengine: sun4i: set the linear_mode properly
authorVinod Koul <vkoul@kernel.org>
Fri, 14 Feb 2020 04:46:09 +0000 (10:16 +0530)
committerVinod Koul <vkoul@kernel.org>
Mon, 17 Feb 2020 06:51:08 +0000 (12:21 +0530)
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>
drivers/dma/sun4i-dma.c

index e87fc7c..e7ff09a 100644 (file)
@@ -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;