1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 7cbac6e8c113..01d936c9fe89 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -1641,6 +1641,12 @@ static void atc_free_chan_resources(struct dma_chan *chan)
         atchan->descs_allocated = 0;
         atchan->status = 0;
 
+        /*
+         * Free atslave allocated in at_dma_xlate()
+         */
+        kfree(chan->private);
+        chan->private = NULL;
+
         dev_vdbg(chan2dev(chan), "free_chan_resources: done\n");
 }
 
@@ -1675,7 +1681,7 @@ static struct dma_chan *at_dma_xlate(struct of_phandle_args *dma_spec,
         dma_cap_zero(mask);
         dma_cap_set(DMA_SLAVE, mask);
 
-        atslave = devm_kzalloc(&dmac_pdev->dev, sizeof(*atslave), GFP_KERNEL);
+        atslave = kzalloc(sizeof(*atslave), GFP_KERNEL);
         if (!atslave)
                 return NULL;
 
@@ -2000,6 +2006,8 @@ static int at_dma_remove(struct platform_device *pdev)
         struct resource         *io;
 
         at_dma_off(atdma);
+        if (pdev->dev.of_node)
+                of_dma_controller_free(pdev->dev.of_node);
         dma_async_device_unregister(&atdma->dma_common);
 
         dma_pool_destroy(atdma->memset_pool);