diff options
| author | Mark Brown <broonie@kernel.org> | 2017-04-30 22:15:41 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-30 22:15:41 +0900 |
| commit | 0c2964cb38ef9dc44c11db7516bab00c1967e52e (patch) | |
| tree | 242e884d5858f9d9f727c01455068f38293b6252 /sound/soc/soc-core.c | |
| parent | d872f04606eec35de3bc4e409e186d01dacdd3d6 (diff) | |
| parent | 081dc8ab46df85382658822e951ea79be87382b0 (diff) | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9ee4d4a56eec..f45748ef9f13 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1913,6 +1913,7 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt); +#ifdef CONFIG_DMI /* Trim special characters, and replace '-' with '_' since '-' is used to * separate different DMI fields in the card long name. Only number and * alphabet characters and a few separator characters are kept. @@ -2044,6 +2045,7 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) return 0; } EXPORT_SYMBOL_GPL(snd_soc_set_dmi_name); +#endif /* CONFIG_DMI */ static int snd_soc_instantiate_card(struct snd_soc_card *card) { @@ -2185,6 +2187,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes, card->num_of_dapm_routes); + /* try to set some sane longname if DMI is available */ + snd_soc_set_dmi_name(card, NULL); + snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname), "%s", card->name); snprintf(card->snd_card->longname, sizeof(card->snd_card->longname), |