diff --git a/[refs] b/[refs]
index 4a29f7a5b66d..92278b82c285 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a5c106a0e8fd03a806d0da77eef10b4045c43a6
+refs/heads/master: 9255f1deec151ac0e84871d06bc27406cb81f26f
diff --git a/trunk/drivers/dma/shdma.c b/trunk/drivers/dma/shdma.c
index 427d514796dd..a2a519fd2a24 100644
--- a/trunk/drivers/dma/shdma.c
+++ b/trunk/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)