diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-02 13:58:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-04 01:27:09 +0200 |
| commit | 104fce73fdbd174eb08a493eeb2920fd59e6d3f4 (patch) | |
| tree | 756279a6a316021201c6e1dc4db56d0086fb5165 /drivers/dma/omap-dma.c | |
| parent | Linux 3.14-rc2 (diff) | |
| download | linux-104fce73fdbd174eb08a493eeb2920fd59e6d3f4.tar.xz linux-104fce73fdbd174eb08a493eeb2920fd59e6d3f4.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/dma/omap-dma.c | 3 |
1 files changed, 1 insertions, 2 deletions
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; |