diff options
author | Vinod Koul <vinod.koul@intel.com> | 2017-11-08 11:01:45 +0530 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2017-11-08 11:04:49 +0530 |
commit | 087ffdd2880b5dd7724ac6d0ca663da398fe1ccf (patch) | |
tree | 3561390769ec01a0f57780954c70ed5d7cd4fffb /drivers/dma | |
parent | 847449f23dcbff68234525f90dd53c7c7db18cad (diff) | |
download | linux-stable-087ffdd2880b5dd7724ac6d0ca663da398fe1ccf.tar.gz linux-stable-087ffdd2880b5dd7724ac6d0ca663da398fe1ccf.tar.bz2 linux-stable-087ffdd2880b5dd7724ac6d0ca663da398fe1ccf.zip |
dmaengine: Revert "rcar-dmac: use TCRB instead of TCR for residue"
This reverts commit 847449f23dcb: ("dmaengine: rcar-dmac: use TCRB instead
of TCR for residue") as it breaks small serial console.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/sh/rcar-dmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c index 50c4950050be..2b2c7db3e480 100644 --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c @@ -1310,7 +1310,7 @@ static unsigned int rcar_dmac_chan_get_residue(struct rcar_dmac_chan *chan, } /* Add the residue for the current chunk. */ - residue += rcar_dmac_chan_read(chan, RCAR_DMATCRB) << desc->xfer_shift; + residue += rcar_dmac_chan_read(chan, RCAR_DMATCR) << desc->xfer_shift; return residue; } |