This is a note to let you know that I've just added the patch titled
ALSA: usb-audio: 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-usb-audio-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 0b4f0debb34754002cee295441c9ca89ba8cdfcc Mon Sep 17 00:00:00 2001
From: "Maciej S. Szmigiero" <maciej.szmigiero@xxxxxxxxxx>
Date: Thu, 20 Oct 2022 22:46:22 +0200
Subject: ALSA: usb-audio: Use snd_ctl_rename() to rename a control
From: Maciej S. Szmigiero <maciej.szmigiero@xxxxxxxxxx>
commit 0b4f0debb34754002cee295441c9ca89ba8cdfcc 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/723877882e3a56bb42a2a2214cfc85f347d36e19.1666296963.git.maciej.szmigiero@xxxxxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/usb/mixer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index a5641956ef10..9105ec623120 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1631,7 +1631,7 @@ static void check_no_speaker_on_headset(struct snd_kcontrol *kctl,
if (!found)
return;
- strscpy(kctl->id.name, "Headphone", sizeof(kctl->id.name));
+ snd_ctl_rename(card, kctl, "Headphone");
}
static const struct usb_feature_control_info *get_feature_control_info(int control)
--
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
