diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index dffbd4bb..3d277fa 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -2393,6 +2393,17 @@
 	return ret;
 }
 
+static void edma_cleanupp_vchan(struct dma_device *dmadev)
+{
+	struct edma_chan *echan, *_echan;
+
+	list_for_each_entry_safe(echan, _echan,
+			&dmadev->channels, vchan.chan.device_node) {
+		list_del(&echan->vchan.chan.device_node);
+		tasklet_kill(&echan->vchan.task);
+	}
+}
+
 static int edma_remove(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -2401,6 +2412,8 @@
 	devm_free_irq(dev, ecc->ccint, ecc);
 	devm_free_irq(dev, ecc->ccerrint, ecc);
 
+	edma_cleanupp_vchan(&ecc->dma_slave);
+
 	if (dev->of_node)
 		of_dma_controller_free(dev->of_node);
 	dma_async_device_unregister(&ecc->dma_slave);