diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-04-20 04:34:49 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-05-17 12:21:20 +0300 |
| commit | dedfaa1eedc7309252989a7defab4d565a9f481b (patch) | |
| tree | dec43e4367f362271788b5c5593a909d101c2376 | |
| parent | 5711c97920377827da4bbc18233ffb08c6e3bbef (diff) | |
| download | linux-dedfaa1eedc7309252989a7defab4d565a9f481b.tar.xz | |
ASoC: simple-card-utils: enable "label" on asoc_simple_card_parse_card_name
Current asoc_simple_card_parse_card_name() detects [prefix]name,
but in generally, we uses "label" for user visible names.
This patch enables it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/generic/simple-card-utils.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 343b291fc372..c5ab8ad2a5ce 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -81,15 +81,21 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_set_dailink_name); int asoc_simple_card_parse_card_name(struct snd_soc_card *card, char *prefix) { - char prop[128]; int ret; - snprintf(prop, sizeof(prop), "%sname", prefix); + if (!prefix) + prefix = ""; /* Parse the card name from DT */ - ret = snd_soc_of_parse_card_name(card, prop); - if (ret < 0) - return ret; + ret = snd_soc_of_parse_card_name(card, "label"); + if (ret < 0) { + char prop[128]; + + snprintf(prop, sizeof(prop), "%sname", prefix); + ret = snd_soc_of_parse_card_name(card, prop); + if (ret < 0) + return ret; + } if (!card->name && card->dai_link) card->name = card->dai_link->name; |