Merge tag 'dmaengine-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[sfrench/cifs-2.6.git] / drivers / dma / pl330.c

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 3cf0b38387ae5604adf7fbf07574444171c21043..5f6d7f1e095f906ec22b4a4b6f67cc7309242994 100644 (file)
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -1053,6 +1053,9 @@ static bool _trigger(struct pl330_thread *thrd)
 
        thrd->req_running = idx;
 
+       if (desc->rqtype == DMA_MEM_TO_DEV || desc->rqtype == DMA_DEV_TO_MEM)
+               UNTIL(thrd, PL330_STATE_WFP);
+
        return true;
 }
 
@@ -2585,6 +2588,7 @@ static struct dma_pl330_desc *pluck_desc(struct list_head *pool,
 
                desc->status = PREP;
                desc->txd.callback = NULL;
+               desc->txd.callback_result = NULL;
        }
 
        spin_unlock_irqrestore(lock, flags);