diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:14:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:14:57 +0100 |
| commit | 9884afa2fdce71cd35bb79303f9050f0d76e3d03 (patch) | |
| tree | e4bd1187eee271fd93b8a99c5a951afaa53c4d80 /drivers/dma/sh/rcar-dmac.c | |
| parent | fbfcd0199170984bd3c2812e49ed0fe7b226959a (diff) | |
| parent | 0c8efd610b58cb23cefdfa12015799079aef94ae (diff) | |
Merge tag 'v4.16-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/dma/sh/rcar-dmac.c')
| -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 e3ff162c03fc..d0cacdb0713e 100644 --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c @@ -917,7 +917,7 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_chan *chan, struct scatterlist *sgl, rcar_dmac_chan_configure_desc(chan, desc); - max_chunk_size = (RCAR_DMATCR_MASK + 1) << desc->xfer_shift; + max_chunk_size = RCAR_DMATCR_MASK << desc->xfer_shift; /* * Allocate and fill the transfer chunk descriptors. We own the only |