Commit 5c219a34 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda: Fix kctl->id initialization 



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: c27e1efb ("ALSA: control: Use xarray for faster lookups")
Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20230606093855.14685-5-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c5ae57b1

sound/pci/hda/hda_codec.c

+5 −1
Original line number Diff line number Diff line
@@ -2458,10 +2458,14 @@ int snd_hda_create_dig_out_ctls(struct hda_codec *codec, 
		   type == HDA_PCM_TYPE_HDMI) {

		/* suppose a single SPDIF device */

		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);

			if (!kctl)

				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;

	}