1 files changed, 14 insertions, 3 deletions

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 01619c2910e3..5f5b975887fc 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2000,6 +2000,12 @@ void omap_dma_global_context_restore(void)
                         omap_clear_dma(ch);
 }
 
+struct omap_system_dma_plat_info *omap_get_plat_info(void)
+{
+        return p;
+}
+EXPORT_SYMBOL_GPL(omap_get_plat_info);
+
 static int omap_system_dma_probe(struct platform_device *pdev)
 {
         int ch, ret = 0;
@@ -2024,9 +2030,16 @@ static int omap_system_dma_probe(struct platform_device *pdev)
 
         dma_lch_count           = d->lch_count;
         dma_chan_count          = dma_lch_count;
-        dma_chan                = d->chan;
         enable_1510_mode        = d->dev_caps & ENABLE_1510_MODE;
 
+        dma_chan = devm_kcalloc(&pdev->dev, dma_lch_count,
+                                sizeof(struct omap_dma_lch), GFP_KERNEL);
+        if (!dma_chan) {
+                dev_err(&pdev->dev, "%s: kzalloc fail\n", __func__);
+                return -ENOMEM;
+        }
+
+
         if (dma_omap2plus()) {
                 dma_linked_lch = kzalloc(sizeof(struct dma_link_info) *
                                                 dma_lch_count, GFP_KERNEL);
@@ -2111,7 +2124,6 @@ exit_dma_irq_fail:
         }
 
 exit_dma_lch_fail:
-        kfree(dma_chan);
         return ret;
 }
 
@@ -2131,7 +2143,6 @@ static int omap_system_dma_remove(struct platform_device *pdev)
                         free_irq(dma_irq, (void *)(irq_rel + 1));
                 }
         }
-        kfree(dma_chan);
         return 0;
 }