From: Guennadi Liakhovetski Date: Fri, 21 May 2010 15:30:12 +0000 (+0000) Subject: sh: guard cookie consistency across termination in the DMA driver X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9255f1deec151ac0e84871d06bc27406cb81f26f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Paul Mundt --- diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index 427d514796dd..a2a519fd2a24 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)