From: Joachim Eastwood <manabian@gmail.com>
Date: Wed, 1 Jun 2011 21:59:10 +0000 (+0200)
Subject: ASoC: atmel_ssc: Don't try to free ssc if request failed
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=840d8e5e964dc51673d0f26e119b27d2898e8417;p=openwrt%2Fstaging%2Fblogic.git

ASoC: atmel_ssc: Don't try to free ssc if request failed

We should only call ssc_free() when ssc_request() succeeds or bad
things will happen.

Signed-off-by: Joachim Eastwood <joachim.eastwood@jotron.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 7fbfa051f6e1..eda955b15834 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -848,9 +848,10 @@ int atmel_ssc_set_audio(int ssc_id)
 	if (IS_ERR(ssc))
 		pr_warn("Unable to parent ASoC SSC DAI on SSC: %ld\n",
 			PTR_ERR(ssc));
-	else
+	else {
 		ssc_pdev->dev.parent = &(ssc->pdev->dev);
-	ssc_free(ssc);
+		ssc_free(ssc);
+	}
 
 	ret = platform_device_add(ssc_pdev);
 	if (ret < 0)