diff options
| author | Mark Brown <broonie@kernel.org> | 2016-08-24 19:05:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-24 19:05:17 +0100 |
| commit | ae16842306be347fa44ec6cc642d7f6ac8b7b889 (patch) | |
| tree | 88841959bc7815b8e723124995bc8e66b2cf71a1 /sound | |
| parent | fa8410b355251fd30341662a40ac6b22d3e38468 (diff) | |
| parent | 70fcad495b9903d362bdbf9ffba23259294064c8 (diff) | |
| download | linux-0-day-ae16842306be347fa44ec6cc642d7f6ac8b7b889.tar.gz linux-0-day-ae16842306be347fa44ec6cc642d7f6ac8b7b889.tar.xz | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 16369cad48038..b0e23db836959 100644 --- 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); |