Commit c5ae57b1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: gus: Fix kctl->id initialization 



GUS driver replaces the kctl->id.index after assigning the kctl via
snd_ctl_add().  This doesn't work any longer with the new Xarray
lookup change.  It has to be set before snd_ctl_add() call 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-4-tiwai@suse.de


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

sound/isa/gus/gus_pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -892,10 +892,10 @@ int snd_gf1_pcm_new(struct snd_gus_card *gus, int pcm_dev, int control_index) 
		kctl = snd_ctl_new1(&snd_gf1_pcm_volume_control1, gus);

	else

		kctl = snd_ctl_new1(&snd_gf1_pcm_volume_control, gus);

	kctl->id.index = control_index;

	err = snd_ctl_add(card, kctl);

	if (err < 0)

		return err;

	kctl->id.index = control_index;



	return 0;

}