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>

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 343b291fc3725f46b4d5270b65d5100ca083ef61..c5ab8ad2a5ce5c52dede96348f7735b34639bcf8 100644 (file)
--- 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;