This is a note to let you know that I've just added the patch titled
ALSA: emu10k1: Use snd_ctl_rename() to rename a control
to the 6.0-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-emu10k1-use-snd_ctl_rename-to-rename-a-control.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 36476b81b2b5db1de5adb8ced1f71b8972a9d4dd Mon Sep 17 00:00:00 2001
From: "Maciej S. Szmigiero" <maciej.szmigiero@xxxxxxxxxx>
Date: Thu, 20 Oct 2022 22:46:24 +0200
Subject: ALSA: emu10k1: Use snd_ctl_rename() to rename a control
From: Maciej S. Szmigiero <maciej.szmigiero@xxxxxxxxxx>
commit 36476b81b2b5db1de5adb8ced1f71b8972a9d4dd upstream.
With the recent addition of hashed controls lookup it's not enough to just
update the control name field, the hash entries for the modified control
have to be updated too.
snd_ctl_rename() takes care of that, so use it instead of directly
modifying the control name.
Fixes: c27e1efb61c5 ("ALSA: control: Use xarray for faster lookups")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@xxxxxxxxxx>
Link: https://lore.kernel.org/r/38b19f019f95ee78a6e4e59d39afb9e2c3379413.1666296963.git.maciej.szmigiero@xxxxxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/emu10k1/emumixer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index e9c0fe3b8446..3c115f8ab96c 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -1767,7 +1767,7 @@ static int rename_ctl(struct snd_card *card, const char *src, const char *dst)
{
struct snd_kcontrol *kctl = ctl_find(card, src);
if (kctl) {
- strcpy(kctl->id.name, dst);
+ snd_ctl_rename(card, kctl, dst);
return 0;
}
return -ENOENT;
--
2.38.1
Patches currently in stable-queue which might be from maciej.szmigiero@xxxxxxxxxx are
queue-6.0/alsa-emu10k1-use-snd_ctl_rename-to-rename-a-control.patch
queue-6.0/alsa-ca0106-use-snd_ctl_rename-to-rename-a-control.patch
queue-6.0/alsa-hda-realtek-use-snd_ctl_rename-to-rename-a-control.patch
queue-6.0/alsa-ac97-use-snd_ctl_rename-to-rename-a-control.patch
queue-6.0/alsa-usb-audio-use-snd_ctl_rename-to-rename-a-control.patch
queue-6.0/alsa-control-add-snd_ctl_rename.patch
