From: Julia Lawall <julia@diku.dk>
To: Liam Girdwood <lrg@ti.com>
Cc: alsa-devel@alsa-project.org, Takashi Iwai <tiwai@suse.de>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
Dong Aisheng <b29396@freescale.com>
Subject: [PATCH 3/4] sound/soc/mxs/mxs-saif.c: add missing kfree
Date: Sat, 20 Aug 2011 06:12:40 +0000 [thread overview]
Message-ID: <1313820761-12042-3-git-send-email-julia@diku.dk> (raw)
From: Julia Lawall <julia@diku.dk>
The error handling code prior to get_clk also needs to call kfree. The
label name is changed to reflect its more general use.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier x;
expression E1!=0,E2,E3,E4;
statement S;
iterator I;
@@
(
if (...) { ... when != kfree(x)
when != x = E3
when != E3 = x
* return ...;
}
... when != x = E2
when != I(...,x,...) S
if (...) { ... when != x = E4
kfree(x); ... return ...; }
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
sound/soc/mxs/mxs-saif.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 0b3adae..4a17bc8 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -523,8 +523,10 @@ static int mxs_saif_probe(struct platform_device *pdev)
if (!saif)
return -ENOMEM;
- if (pdev->id >= ARRAY_SIZE(mxs_saif))
- return -EINVAL;
+ if (pdev->id >= ARRAY_SIZE(mxs_saif)) {
+ ret = -EINVAL;
+ goto failed;
+ }
mxs_saif[pdev->id] = saif;
saif->clk = clk_get(&pdev->dev, NULL);
@@ -532,7 +534,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
ret = PTR_ERR(saif->clk);
dev_err(&pdev->dev, "Cannot get the clock: %d\n",
ret);
- goto failed_clk;
+ goto failed;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -625,7 +627,7 @@ failed_ioremap:
release_mem_region(res->start, resource_size(res));
failed_get_resource:
clk_put(saif->clk);
-failed_clk:
+failed:
kfree(saif);
return ret;
next reply other threads:[~2011-08-20 6:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-20 6:12 Julia Lawall [this message]
2011-08-20 13:44 ` [PATCH 3/4] sound/soc/mxs/mxs-saif.c: add missing kfree Wolfram Sang
2011-08-20 15:18 ` Julia Lawall
2011-08-21 10:29 ` Dong Aisheng-B29396
2011-08-21 10:57 ` Julia Lawall
2011-08-21 11:18 ` [PATCH] " Julia Lawall
2011-08-21 11:29 ` Wolfram Sang
2011-08-21 13:40 ` Dong Aisheng-B29396
2011-08-22 10:21 ` Liam Girdwood
2011-08-22 22:35 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1313820761-12042-3-git-send-email-julia@diku.dk \
--to=julia@diku.dk \
--cc=alsa-devel@alsa-project.org \
--cc=b29396@freescale.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox