Skip to content

Commit 4fdcc79

Browse files
committed
ASoC: macaudio: Set long_name during probe()
This prevents filling the long_name from DMI data soon to be provided by u-boot's SMBIOS support. This is necessary since ALSA ucm uses the long name to load the ucm config file. The asahi ucm config files are use the "model" property from devicetree. The DMI information is not always present and should not be used on these systems. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent bcd409d commit 4fdcc79

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

sound/soc/apple/macaudio.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,11 @@ static int macaudio_parse_of(struct macaudio_snd_data *ma)
489489
dev_err_probe(dev, ret, "parsing card name\n");
490490
return ret;
491491
}
492+
/*
493+
* Set long_name to prevent snd_soc_set_dmi_name() from setting one from
494+
* make believe data u-boot provides in its SMBIOS emulation.
495+
*/
496+
card->long_name = card->name;
492497

493498
/* Populate links, start with the fixed number of FE links */
494499
num_links = ARRAY_SIZE(macaudio_fe_links);

0 commit comments

Comments
 (0)