diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-28 09:45:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-28 09:45:18 -0700 |
| commit | 72a6e35db32b63883e2e3d19cd6a515eac1f5d67 (patch) | |
| tree | 005d1ce9461d78bd6e6fbeb746131547d3858908 /drivers/dma/mediatek/mtk-cqdma.c | |
| parent | 25cce03b1d06e4b742f6dafdda2f4d80c13bdc18 (diff) | |
| parent | 5bb5c3a3ac102158b799bf5eda871223aa5e9c25 (diff) | |
Merge tag 'dmaengine-fix-5.1-rc7' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
- fix for wrong register use in mediatek driver
- fix in sh driver for glitch is tx_status and treating 0 a valid
residue for cyclic
- fix in bcm driver for using right memory allocation flag
* tag 'dmaengine-fix-5.1-rc7' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: mediatek-cqdma: fix wrong register usage in mtk_cqdma_start
dmaengine: sh: rcar-dmac: Fix glitch in dmaengine_tx_status
dmaengine: sh: rcar-dmac: With cyclic DMA residue 0 is valid
dmaengine: bcm2835: Avoid GFP_KERNEL in device_prep_slave_sg
Diffstat (limited to 'drivers/dma/mediatek/mtk-cqdma.c')
| -rw-r--r-- | drivers/dma/mediatek/mtk-cqdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/mediatek/mtk-cqdma.c b/drivers/dma/mediatek/mtk-cqdma.c index 131f3974740d..814853842e29 100644 --- a/drivers/dma/mediatek/mtk-cqdma.c +++ b/drivers/dma/mediatek/mtk-cqdma.c @@ -253,7 +253,7 @@ static void mtk_cqdma_start(struct mtk_cqdma_pchan *pc, #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT mtk_dma_set(pc, MTK_CQDMA_DST2, cvd->dest >> MTK_CQDMA_ADDR2_SHFIT); #else - mtk_dma_set(pc, MTK_CQDMA_SRC2, 0); + mtk_dma_set(pc, MTK_CQDMA_DST2, 0); #endif /* setup the length */ |