Merge remote-tracking branch 'asoc/fix/core' into asoc-linus

ae168423 · Mark Brown · fa8410b3 · 70fcad49 · ae168423
Commit ae168423 authored Aug 24, 2016 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/soc-core.c sound/soc/soc-core.c +1 -1

No files found.
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1056,7 +1056,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
 	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);