On Wed, Jun 01, 2011 at 11:59:10PM +0200, Joachim Eastwood wrote:

Hello,

Patch below fixes a segmentation fault in atmel_ssc_dai if ssc_request() fails.

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

Adding Liam for his review. Please CC maintainers on patches.

Signed-off-by: Joachim Eastwood joachim.eastwood@jotron.com

sound/soc/atmel/atmel_ssc_dai.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 7fbfa05..eda955b 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)

-- 1.7.5.2