summaryrefslogtreecommitdiff
path: root/drivers/mfd/davinci_voicecodec.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-06-01 18:34:38 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2010-08-12 13:27:20 +0400
commite2bde787131a01d0f2ca9baccaf3d107bf6c0c92 (patch)
tree426c3fc1386079e1f19379294ddf7b2f3ed236da /drivers/mfd/davinci_voicecodec.c
parent8af5fe3bc59d73479ff701340e1a9bc7c6b5f0ff (diff)
downloadlinux-e2bde787131a01d0f2ca9baccaf3d107bf6c0c92.tar.xz
mfd: Fix davinci memory leak
Error handling code following a kmalloc should free the allocated data. The semantic match that finds the problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @r exists@ local idexpression x; statement S; expression E; identifier f,f1,l; position p1,p2; expression *ptr != NULL; @@ x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); ... if (x == NULL) S <... when != x when != if (...) { <+...x...+> } ( x->f1 = E | (x->f1 == NULL || ...) | f(...,x->f1,...) ) ...> ( return \(0\|<+...x...+>\|ptr\); | return@p2 ...; ) @script:python@ p1 << r.p1; p2 << r.p2; @@ print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/davinci_voicecodec.c')
-rw-r--r--drivers/mfd/davinci_voicecodec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c
index 3e75f02e4778..33c923d215c7 100644
--- a/drivers/mfd/davinci_voicecodec.c
+++ b/drivers/mfd/davinci_voicecodec.c
@@ -94,7 +94,8 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
if (!res) {
dev_err(&pdev->dev, "no DMA resource\n");
- return -ENXIO;
+ ret = -ENXIO;
+ goto fail4;
}
davinci_vc->davinci_vcif.dma_tx_channel = res->start;
@@ -104,7 +105,8 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
if (!res) {
dev_err(&pdev->dev, "no DMA resource\n");
- return -ENXIO;
+ ret = -ENXIO;
+ goto fail4;
}
davinci_vc->davinci_vcif.dma_rx_channel = res->start;