Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/da721...

diff --combined sound/soc/soc-core.c
index b0e23db,16369ca,16369ca,16369ca,66a33f1..4afa8db
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
--- 3/sound/soc/soc-core.c
--- 4/sound/soc/soc-core.c
--- 5/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@@@@ -1056,7 -1056,7 -1056,7 -1056,7 -1056,7 +1056,7 @@@@@@ static int soc_bind_dai_link(struct snd
        if (!rtd->platform) {
                dev_err(card->dev, "ASoC: platform %s not registered\n",
                        dai_link->platform_name);
 ----           return -EPROBE_DEFER;
 ++++           goto _err_defer;
        }
     
        soc_add_pcm_runtime(card, rtd);
@@@@@@ -2083,14 -2083,14 -2083,14 -2083,14 -2083,13 +2083,13 @@@@@@ static int soc_cleanup_card_resources(s
        /* remove auxiliary devices */
        soc_remove_aux_devices(card);
     
++++    snd_soc_dapm_free(&card->dapm);
        soc_cleanup_card_debugfs(card);
     
        /* remove the card */
        if (card->remove)
                card->remove(card);
     
----    snd_soc_dapm_free(&card->dapm);
---- 
        snd_card_free(card->snd_card);
        return 0;