Merge branch 'for-3.0' into for-3.1

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 a7a7bbc07627..f53dc09c48f3 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -846,9 +846,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)