Hi Rob > > @@ -82,14 +82,24 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, > > char *prefix) > > { > > char prop[128]; > > + char *names[] = { > > + "label", "name" > > + }; > > + int i; > > 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; > > + for (i = 0; i < ARRAY_SIZE(names); i++) { > > + snprintf(prop, sizeof(prop), "%s%s", prefix, names[i]); > > "<prefix>label" is not a valid property name. This function will be used from many drivers. Not only for OF-graph sound card. OF-graph sound card will use it without prefix. Best regards --- Kuninori Morimoto -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html