Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-30 14:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: ymfpci: Fix kctl->id initialization

Browse Source 
ymfpci driver replaces the kctl->id.device 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: 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-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2023-06-06 11:38:52 +02:00
parent b9a4efd61b
commit c9b83ae4a1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/pci/ymfpci/ymfpci_main.c
View File

@ -1822,20 +1822,20 @@ int snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch)
if (snd_BUG_ON(!chip->pcm_spdif)) if (snd_BUG_ON(!chip->pcm_spdif))
return -ENXIO; return -ENXIO;
kctl = snd_ctl_new1(&snd_ymfpci_spdif_default, chip); kctl = snd_ctl_new1(&snd_ymfpci_spdif_default, chip);
kctl->id.device = chip->pcm_spdif->device;
err = snd_ctl_add(chip->card, kctl); err = snd_ctl_add(chip->card, kctl);
if (err < 0) if (err < 0)
return err; return err;
kctl->id.device = chip->pcm_spdif->device;
kctl = snd_ctl_new1(&snd_ymfpci_spdif_mask, chip); kctl = snd_ctl_new1(&snd_ymfpci_spdif_mask, chip);
kctl->id.device = chip->pcm_spdif->device;
err = snd_ctl_add(chip->card, kctl); err = snd_ctl_add(chip->card, kctl);
if (err < 0) if (err < 0)
return err; return err;
kctl->id.device = chip->pcm_spdif->device;
kctl = snd_ctl_new1(&snd_ymfpci_spdif_stream, chip); kctl = snd_ctl_new1(&snd_ymfpci_spdif_stream, chip);
kctl->id.device = chip->pcm_spdif->device;
err = snd_ctl_add(chip->card, kctl); err = snd_ctl_add(chip->card, kctl);
if (err < 0) if (err < 0)
return err; return err;
kctl->id.device = chip->pcm_spdif->device;
chip->spdif_pcm_ctl = kctl; chip->spdif_pcm_ctl = kctl;
/* direct recording source */ /* direct recording source */