All of lore.kernel.org
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: Sedji Gaouaou <sedji.gaouaou@atmel.com>,
	Liam Girdwood <lrg@slimlogic.co.uk>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	alsa-devel@alsa-project.org
Subject: [PATCH 4/8] ASoC: sam9g20_wm8731: fix resource leak in at91sam9g20ek_init error path
Date: Thu, 25 Nov 2010 15:11:03 +0800	[thread overview]
Message-ID: <1290669063.30158.14.camel@mola> (raw)
In-Reply-To: <1290668785.30158.7.camel@mola>

Fix the error path to properly free allocated resources.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 sound/soc/atmel/sam9g20_wm8731.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 1c9de19..af3c730 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -240,6 +240,7 @@ static int __init at91sam9g20ek_init(void)
 	if (!at91sam9g20ek_snd_device) {
 		printk(KERN_ERR "ASoC: Platform device allocation failed\n");
 		ret = -ENOMEM;
+		goto err_mclk;
 	}
 
 	platform_set_drvdata(at91sam9g20ek_snd_device,
@@ -248,11 +249,13 @@ static int __init at91sam9g20ek_init(void)
 	ret = platform_device_add(at91sam9g20ek_snd_device);
 	if (ret) {
 		printk(KERN_ERR "ASoC: Platform device allocation failed\n");
-		platform_device_put(at91sam9g20ek_snd_device);
+		goto err_device_add;
 	}
 
 	return ret;
 
+err_device_add:
+	platform_device_put(at91sam9g20ek_snd_device);
 err_mclk:
 	clk_put(mclk);
 	mclk = NULL;
-- 
1.7.2

  parent reply	other threads:[~2010-11-25  7:11 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-25  7:06 [PATCH 0/8] ASoC: fix resource leak in error paths Axel Lin
2010-11-25  7:07 ` [PATCH 1/8] ASoC: efika-audio-fabric: fix resource leak in efika_fabric_init error path Axel Lin
2010-11-25  7:08 ` [PATCH 2/8] ASoC: pcm030-audio-fabric: fix resource leak in pcm030_fabric_init " Axel Lin
2010-11-25  7:10 ` [PATCH 3/8] ASoC: snd-soc-afeb9260: remove unneeded platform_device_del in " Axel Lin
2010-11-25  7:11 ` Axel Lin [this message]
2010-11-25  7:11 ` [PATCH 5/8] ASoC: smdk_wm9713: fix resource leak in smdk_init " Axel Lin
2010-11-25  7:12 ` [PATCH 6/8] ASoC: simone: fix resource leak in simone_init " Axel Lin
2010-11-25  8:06   ` Mika Westerberg
2010-11-25  8:06     ` Mika Westerberg
2010-11-25  7:13 ` [PATCH 7/8] ASoC: imx-ssi: fix resource leak Axel Lin
2010-11-25  9:19   ` Sascha Hauer
2010-11-25  9:19     ` Sascha Hauer
2010-11-25  7:14 ` [PATCH 8/8] ASoC: phycore-ac97: " Axel Lin
2010-11-25  9:19   ` Sascha Hauer
2010-11-25  9:19     ` Sascha Hauer
2010-11-25 10:47 ` [PATCH 0/8] ASoC: fix resource leak in error paths Liam Girdwood
2010-11-25 10:47   ` Liam Girdwood
2010-11-25 11:14 ` Mark Brown
2010-11-25 11:14   ` 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=1290669063.30158.14.camel@mola \
    --to=axel.lin@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@slimlogic.co.uk \
    --cc=sedji.gaouaou@atmel.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.