This is a note to let you know that I've just added the patch titled
ALSA: ymfpci: Fix kctl->id initialization
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-ymfpci-fix-kctl-id-initialization.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c9b83ae4a1609b1914ba7fc70826a3f3a8b234db Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Tue, 6 Jun 2023 11:38:52 +0200
Subject: ALSA: ymfpci: Fix kctl->id initialization
From: Takashi Iwai <tiwai@xxxxxxx>
commit c9b83ae4a1609b1914ba7fc70826a3f3a8b234db upstream.
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: c27e1efb61c5 ("ALSA: control: Use xarray for faster lookups")
Cc: <stable@xxxxxxxxxxxxxxx>
Reviewed-by: Jaroslav Kysela <perex@xxxxxxxx>
Link: https://lore.kernel.org/r/20230606093855.14685-2-tiwai@xxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/ymfpci/ymfpci_main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -1827,20 +1827,20 @@ int snd_ymfpci_mixer(struct snd_ymfpci *
if (snd_BUG_ON(!chip->pcm_spdif))
return -ENXIO;
kctl = snd_ctl_new1(&snd_ymfpci_spdif_default, chip);
+ kctl->id.device = chip->pcm_spdif->device;
err = snd_ctl_add(chip->card, kctl);
if (err < 0)
return err;
- kctl->id.device = chip->pcm_spdif->device;
kctl = snd_ctl_new1(&snd_ymfpci_spdif_mask, chip);
+ kctl->id.device = chip->pcm_spdif->device;
err = snd_ctl_add(chip->card, kctl);
if (err < 0)
return err;
- kctl->id.device = chip->pcm_spdif->device;
kctl = snd_ctl_new1(&snd_ymfpci_spdif_stream, chip);
+ kctl->id.device = chip->pcm_spdif->device;
err = snd_ctl_add(chip->card, kctl);
if (err < 0)
return err;
- kctl->id.device = chip->pcm_spdif->device;
chip->spdif_pcm_ctl = kctl;
/* direct recording source */
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-6.1/alsa-hda-fix-kctl-id-initialization.patch
queue-6.1/alsa-hda-realtek-add-quirk-for-clevo-ns50au.patch
queue-6.1/alsa-ice1712-ice1724-fix-the-kcontrol-id-initialization.patch
queue-6.1/alsa-hda-realtek-add-a-quirk-for-hp-slim-desktop-s01.patch
queue-6.1/alsa-hda-realtek-add-lenovo-p3-tower-platform.patch
queue-6.1/alsa-hda-realtek-add-quirks-for-asus-rog-2024-laptops-using-cs35l41.patch
queue-6.1/alsa-gus-fix-kctl-id-initialization.patch
queue-6.1/alsa-cmipci-fix-kctl-id-initialization.patch
queue-6.1/alsa-ymfpci-fix-kctl-id-initialization.patch
