From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 2 Nov 2013 12:58:29 +0000 (+0000)
Subject: dmaengine: omap-dma: use devm_kzalloc() to allocate omap_dmadev.
X-Git-Tag: v3.15-rc1~82^2~1^5~25
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=104fce73fdbd174eb08a493eeb2920fd59e6d3f4;p=karo-tx-linux.git

dmaengine: omap-dma: use devm_kzalloc() to allocate omap_dmadev.

Use devm_kzalloc() to allocate omap_dmadev() so that we don't need
complex error cleanup paths.

Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index 362e7c49f2e1..98034e8c558f 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -594,7 +594,6 @@ static void omap_dma_free(struct omap_dmadev *od)
 		tasklet_kill(&c->vc.task);
 		kfree(c);
 	}
-	kfree(od);
 }
 
 static int omap_dma_probe(struct platform_device *pdev)
@@ -602,7 +601,7 @@ static int omap_dma_probe(struct platform_device *pdev)
 	struct omap_dmadev *od;
 	int rc, i;
 
-	od = kzalloc(sizeof(*od), GFP_KERNEL);
+	od = devm_kzalloc(&pdev->dev, sizeof(*od), GFP_KERNEL);
 	if (!od)
 		return -ENOMEM;