This is a note to let you know that I've just added the patch titled
ALSA: cmipci: 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-cmipci-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 f2f312ad88c68a7f4a7789b9269ae33af3c7c7e9 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Tue, 6 Jun 2023 11:38:53 +0200
Subject: ALSA: cmipci: Fix kctl->id initialization
From: Takashi Iwai <tiwai@xxxxxxx>
commit f2f312ad88c68a7f4a7789b9269ae33af3c7c7e9 upstream.
cmipci 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-3-tiwai@xxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/cmipci.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 727db6d43391..6d25c12d9ef0 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -2688,20 +2688,20 @@ static int snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_device)
}
if (cm->can_ac3_hw) {
kctl = snd_ctl_new1(&snd_cmipci_spdif_default, cm);
+ kctl->id.device = pcm_spdif_device;
err = snd_ctl_add(card, kctl);
if (err < 0)
return err;
- kctl->id.device = pcm_spdif_device;
kctl = snd_ctl_new1(&snd_cmipci_spdif_mask, cm);
+ kctl->id.device = pcm_spdif_device;
err = snd_ctl_add(card, kctl);
if (err < 0)
return err;
- kctl->id.device = pcm_spdif_device;
kctl = snd_ctl_new1(&snd_cmipci_spdif_stream, cm);
+ kctl->id.device = pcm_spdif_device;
err = snd_ctl_add(card, kctl);
if (err < 0)
return err;
- kctl->id.device = pcm_spdif_device;
}
if (cm->chip_version <= 37) {
sw = snd_cmipci_old_mixer_switches;
--
2.41.0
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
