sh: guard cookie consistency across termination in the DMA driver
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Fri, 21 May 2010 15:30:12 +0000 (15:30 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Sat, 22 May 2010 08:06:35 +0000 (17:06 +0900)
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

index 427d514796dd28d8547c48e3ffe15ca16247fcef..a2a519fd2a24fc3ec9f4d1daa63fba110d99684e 100644 (file)
@@ -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)