Skip to content

Commit

Permalink
ALSA: gus: Fix kctl->id initialization
Browse files Browse the repository at this point in the history
commit c5ae57b upstream.

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: c27e1ef ("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-4-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
tiwai authored and gregkh committed Jun 14, 2023
1 parent cf671d2 commit a1374d2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/isa/gus/gus_pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit a1374d2

Please sign in to comment.