|
@@ -2599,7 +2599,8 @@ static int snd_soc_register_dais(struct snd_soc_component *component,
|
|
* the same naming style even though those DAIs are not
|
|
* the same naming style even though those DAIs are not
|
|
* component-less anymore.
|
|
* component-less anymore.
|
|
*/
|
|
*/
|
|
- if (count == 1 && legacy_dai_naming) {
|
|
|
|
|
|
+ if (count == 1 && legacy_dai_naming &&
|
|
|
|
+ (dai_drv[i].id == 0 || dai_drv[i].name == NULL)) {
|
|
dai->name = fmt_single_name(dev, &dai->id);
|
|
dai->name = fmt_single_name(dev, &dai->id);
|
|
} else {
|
|
} else {
|
|
dai->name = fmt_multiple_name(dev, &dai_drv[i]);
|
|
dai->name = fmt_multiple_name(dev, &dai_drv[i]);
|