ASoC: atmel_ssc: Don't try to free ssc if request failed
authorJoachim Eastwood <manabian@gmail.com>
Wed, 1 Jun 2011 21:59:10 +0000 (23:59 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 3 Jun 2011 09:04:17 +0000 (10:04 +0100)
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>
sound/soc/atmel/atmel_ssc_dai.c

index 7fbfa05..eda955b 100644 (file)
@@ -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));
        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_pdev->dev.parent = &(ssc->pdev->dev);
-       ssc_free(ssc);
+               ssc_free(ssc);
+       }
 
        ret = platform_device_add(ssc_pdev);
        if (ret < 0)
 
        ret = platform_device_add(ssc_pdev);
        if (ret < 0)