diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 11:38:23 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 11:38:23 +0200 |
| commit | 05d3962cc921c51059df69488c7f70ab8b6a5d88 (patch) | |
| tree | 0688d35655fb8643bfbeb4a285a5e68719145f51 /sound/soc/atmel | |
| parent | Linux 3.0-rc1 (diff) | |
| parent | ASoC: atmel_ssc: Don't try to free ssc if request failed (diff) | |
| download | linux-05d3962cc921c51059df69488c7f70ab8b6a5d88.tar.xz linux-05d3962cc921c51059df69488c7f70ab8b6a5d88.zip | |
Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-3.0
Diffstat (limited to 'sound/soc/atmel')
| -rw-r--r-- | 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 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) |