浏览代码

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>
Guennadi Liakhovetski 15 年之前
父节点
当前提交
9255f1deec
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      drivers/dma/shdma.c

+ 4 - 0
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))
 	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)
 static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan)