diff options
| author | Cyrille Pitchen <cyrille.pitchen@atmel.com> | 2015-12-07 15:58:56 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-12-10 09:48:01 +0530 |
| commit | aa876cd4b41b4e3bcfbc75dd5750d75d5fa97a67 (patch) | |
| tree | 4a4e8f074b5bc0ea2a3f8746bc0366ff4ff95dd6 /drivers/dma | |
| parent | bcb4b619116569d071b26c6f33506459a560ab6a (diff) | |
| download | linux-stable-aa876cd4b41b4e3bcfbc75dd5750d75d5fa97a67.tar.gz linux-stable-aa876cd4b41b4e3bcfbc75dd5750d75d5fa97a67.tar.bz2 linux-stable-aa876cd4b41b4e3bcfbc75dd5750d75d5fa97a67.zip | |
dmaengine: at_xdmac: fix at_xdmac_prep_dma_memcpy()
This patch fixes at_xdmac_prep_dma_memcpy(). Indeed the data width field
of the Channel Configuration register was not updated properly in the
loop: the bits of the dwidth field were not cleared before adding their
new value.
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Fixes: e1f7c9eee70 ("dmaengine: at_xdmac: creation of the atmel eXtended DMA Controller driver")
Cc: stable@vger.kernel.org #4.1 and later
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/at_xdmac.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c index bda49519b6de..370c661c7d7b 100644 --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c @@ -1088,6 +1088,7 @@ at_xdmac_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, /* Check remaining length and change data width if needed. */ dwidth = at_xdmac_align_width(chan, src_addr | dst_addr | xfer_size); + chan_cc &= ~AT_XDMAC_CC_DWIDTH_MASK; chan_cc |= AT_XDMAC_CC_DWIDTH(dwidth); ublen = xfer_size >> dwidth; |