Commit a1b2cc50 authored May 31, 2011 by Guennadi Liakhovetski Committed by Paul Mundt Jun 02, 2011

dmaengine: shdma: fix a regression: initialise DMA channels for memcpy



A recent patch has introduced a regression, where repeating a memcpy
DMA test with shdma module unloading between them skips the DMA channel
configuration. Fix this regression by always configuring the channel
during its allocation.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

parent 1222de7c

drivers/dma/shdma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -343,7 +343,7 @@ static int sh_dmae_alloc_chan_resources(struct dma_chan *chan)

		dmae_set_dmars(sh_chan, cfg->mid_rid);
		dmae_set_chcr(sh_chan, cfg->chcr);
		} else if ((sh_dmae_readl(sh_chan, CHCR) & 0xf00) != 0x400) {
		} else {
		dmae_init(sh_chan);
		}