Re: [PATCH 5/8] ASoC: smdk_wm9713: fix resource leak in smdk_init error path

Re: [PATCH 5/8] ASoC: smdk_wm9713: fix resource leak in smdk_init error path

[JASWINDERSINGH BRAR]

------- Original Message -------
Sender : Axel Lin<axel.lin@gmail.com> 
Date   : Nov 25, 2010 16:11 (GMT+09:00)
Title  : [PATCH 5/8] ASoC: smdk_wm9713: fix resource leak in smdk_init error path

> Fix the error path to properly free allocated resources.

Acked-by: Jassi Brar <jassi.brar@samsung.com>

[PATCH 0/8] ASoC: fix resource leak in error paths

[Axel Lin]

This serial of patches fix resource leak in error paths.

Axel Lin (8):
  ASoC: efika-audio-fabric: fix resource leak in efika_fabric_init
    error path
  ASoC: pcm030-audio-fabric: fix resource leak in pcm030_fabric_init
    error path
  ASoC: snd-soc-afeb9260: remove unneeded platform_device_del in error
    path
  ASoC: sam9g20_wm8731: fix resource leak in at91sam9g20ek_init error
    path
  ASoC: smdk_wm9713: fix resource leak in smdk_init error path
  ASoC: simone: fix resource leak in simone_init error path
  ASoC: imx-ssi: fix resource leak
  ASoC: phycore-ac97: fix resource leak

 sound/soc/atmel/sam9g20_wm8731.c    |    5 ++++-
 sound/soc/atmel/snd-soc-afeb9260.c  |    1 -
 sound/soc/ep93xx/simone.c           |   18 ++++++++++--------
 sound/soc/fsl/efika-audio-fabric.c  |    1 +
 sound/soc/fsl/pcm030-audio-fabric.c |    1 +
 sound/soc/imx/imx-ssi.c             |   15 +++++++++++----
 sound/soc/imx/phycore-ac97.c        |   28 +++++++++++++++++++++-------
 sound/soc/samsung/smdk_wm9713.c     |   17 ++++++++++-------
 8 files changed, 58 insertions(+), 28 deletions(-)

-- 
1.7.2

[PATCH 5/8] ASoC: smdk_wm9713: fix resource leak in smdk_init error path

[Axel Lin]

Fix the error path to properly free allocated resources.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 sound/soc/samsung/smdk_wm9713.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/sound/soc/samsung/smdk_wm9713.c b/sound/soc/samsung/smdk_wm9713.c
index 7ce2430..238cb3a 100644
--- a/sound/soc/samsung/smdk_wm9713.c
+++ b/sound/soc/samsung/smdk_wm9713.c
@@ -70,24 +70,27 @@ static int __init smdk_init(void)
 
 	ret = platform_device_add(smdk_snd_wm9713_device);
 	if (ret)
-		goto err;
+		goto err1;
 
 	smdk_snd_ac97_device = platform_device_alloc("soc-audio", -1);
 	if (!smdk_snd_ac97_device) {
 		ret = -ENOMEM;
-		goto err;
+		goto err2;
 	}
 
 	platform_set_drvdata(smdk_snd_ac97_device, &smdk);
 
 	ret = platform_device_add(smdk_snd_ac97_device);
-	if (ret) {
-		platform_device_put(smdk_snd_ac97_device);
-		goto err;
-	}
+	if (ret)
+		goto err3;
 
 	return 0;
-err:
+
+err3:
+	platform_device_put(smdk_snd_ac97_device);
+err2:
+	platform_device_del(smdk_snd_wm9713_device);
+err1:
 	platform_device_put(smdk_snd_wm9713_device);
 	return ret;
 }
-- 
1.7.2