android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: hda: Fix kctl->id initialization

Browse Source 
commit 5c219a340850233aecbb444af964653ecd3d1370 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:
Takashi Iwai 2023-06-06 11:38:55 +02:00 committed by Greg Kroah-Hartman
parent c8a46f39dd
commit be0b9b7a6d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/pci/hda/hda_codec.c
View File

@ -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;
} }