Merge branch 'for-linus-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / dma / edma.c

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 77242b37ef87866acf4681c0934c906ecb75de77..3879f80a4815cb27ba4329e29510752e34331ba4 100644 (file)
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -2451,6 +2451,9 @@ static int edma_pm_resume(struct device *dev)
        int i;
        s8 (*queue_priority_mapping)[2];
 
+       /* re initialize dummy slot to dummy param set */
+       edma_write_slot(ecc, ecc->dummy_slot, &dummy_paramset);
+
        queue_priority_mapping = ecc->info->queue_priority_mapping;
 
        /* Event queue priority mapping */