diff options
| author | Mark Brown <broonie@kernel.org> | 2016-08-24 14:05:17 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-24 14:05:17 -0400 |
| commit | ae16842306be347fa44ec6cc642d7f6ac8b7b889 (patch) | |
| tree | 88841959bc7815b8e723124995bc8e66b2cf71a1 | |
| parent | fa8410b355251fd30341662a40ac6b22d3e38468 (diff) | |
| parent | 70fcad495b9903d362bdbf9ffba23259294064c8 (diff) | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
| -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 16369cad4803..b0e23db83695 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, | |||
| 1056 | if (!rtd->platform) { | 1056 | if (!rtd->platform) { |
| 1057 | dev_err(card->dev, "ASoC: platform %s not registered\n", | 1057 | dev_err(card->dev, "ASoC: platform %s not registered\n", |
| 1058 | dai_link->platform_name); | 1058 | dai_link->platform_name); |
| 1059 | return -EPROBE_DEFER; | 1059 | goto _err_defer; |
| 1060 | } | 1060 | } |
| 1061 | 1061 | ||
| 1062 | soc_add_pcm_runtime(card, rtd); | 1062 | soc_add_pcm_runtime(card, rtd); |