mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
ALSA: hda: Fix kctl->id initialization
commit5c219a3408
upstream. HD-audio core code replaces the kctl->id.index of SPDIF-related controls after assigning via snd_ctl_add(). This doesn't work any longer with the new Xarray lookup change. The change of the kctl->id content has to be done via snd_ctl_rename_id() helper, instead. Fixes:c27e1efb61
("ALSA: control: Use xarray for faster lookups") Cc: <stable@vger.kernel.org> Reviewed-by: Jaroslav Kysela <perex@perex.cz> Link: https://lore.kernel.org/r/20230606093855.14685-5-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c8a46f39dd
commit
be0b9b7a6d
1 changed files with 5 additions and 1 deletions
|
@ -2458,10 +2458,14 @@ int snd_hda_create_dig_out_ctls(struct hda_codec *codec,
|
||||||
type == HDA_PCM_TYPE_HDMI) {
|
type == HDA_PCM_TYPE_HDMI) {
|
||||||
/* suppose a single SPDIF device */
|
/* suppose a single SPDIF device */
|
||||||
for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) {
|
for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) {
|
||||||
|
struct snd_ctl_elem_id id;
|
||||||
|
|
||||||
kctl = find_mixer_ctl(codec, dig_mix->name, 0, 0);
|
kctl = find_mixer_ctl(codec, dig_mix->name, 0, 0);
|
||||||
if (!kctl)
|
if (!kctl)
|
||||||
break;
|
break;
|
||||||
kctl->id.index = spdif_index;
|
id = kctl->id;
|
||||||
|
id.index = spdif_index;
|
||||||
|
snd_ctl_rename_id(codec->card, &kctl->id, &id);
|
||||||
}
|
}
|
||||||
bus->primary_dig_out_type = HDA_PCM_TYPE_HDMI;
|
bus->primary_dig_out_type = HDA_PCM_TYPE_HDMI;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue