diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-13 21:52:23 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-13 21:52:23 +0300 |
| commit | 673f45f7bf7dbb6801a04053e3e2d13dfa42db08 (patch) | |
| tree | 1eaca68ae7681a38d63ba780f858f9ea3813c43d /sound/soc/soc-core.c | |
| parent | bd2b34e485f2361655c6020aa2d3bf2a14ae9dff (diff) | |
| parent | 1a0f2433d7380c957d5d29e60a2eeb03ca3afe21 (diff) | |
| download | linux-673f45f7bf7dbb6801a04053e3e2d13dfa42db08.tar.xz | |
Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4e0f55555e37..e7e70b47590a 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1260,8 +1260,18 @@ static int soc_probe_component(struct snd_soc_card *card, ret = snd_soc_dapm_add_routes(dapm, component->driver->dapm_routes, component->driver->num_dapm_routes); - if (ret < 0) - goto err_probe; + if (ret < 0) { + if (card->disable_route_checks) { + dev_info(card->dev, + "%s: disable_route_checks set, ignoring errors on add_routes\n", + __func__); + } else { + dev_err(card->dev, + "%s: snd_soc_dapm_add_routes failed: %d\n", + __func__, ret); + goto err_probe; + } + } /* see for_each_card_components */ list_add(&component->card_list, &card->component_dev_list); @@ -1948,8 +1958,18 @@ static int snd_soc_bind_card(struct snd_soc_card *card) ret = snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes, card->num_dapm_routes); - if (ret < 0) - goto probe_end; + if (ret < 0) { + if (card->disable_route_checks) { + dev_info(card->dev, + "%s: disable_route_checks set, ignoring errors on add_routes\n", + __func__); + } else { + dev_err(card->dev, + "%s: snd_soc_dapm_add_routes failed: %d\n", + __func__, ret); + goto probe_end; + } + } ret = snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes, card->num_of_dapm_routes); |