git » linux-kernel » commit 9255f1d

sh: guard cookie consistency across termination in the DMA driver

author Guennadi Liakhovetski
2010-05-21 15:30:12 UTC
committer Paul Mundt
2010-05-22 08:06:35 UTC
parent 7a5c106a0e8fd03a806d0da77eef10b4045c43a6
sh: guard cookie consistency across termination in the DMA driver

If all descriptors on a channel are terminated or the channel is released,
update the completed cookie counter to match the last cookie. This prevents
inconsistency warning on resumed DMA operation.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/dma/shdma.c +4 -0 
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 427d514796d..a2a519fd2a2 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -722,6 +722,10 @@ static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all)
 {
 	while (__ld_cleanup(sh_chan, all))
 		;
+
+	if (all)
+		/* Terminating - forgive uncompleted cookies */
+		sh_chan->completed_cookie = sh_chan->common.cookie;
 }
 
 static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan)