From: Maciej S. Szmigiero Date: Thu, 20 Oct 2022 20:46:22 +0000 (+0200) Subject: ALSA: usb-audio: Use snd_ctl_rename() to rename a control X-Git-Tag: v6.1-rc5~4^2~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b4f0debb34754002cee295441c9ca89ba8cdfcc;p=platform%2Fkernel%2Flinux-starfive.git ALSA: usb-audio: Use snd_ctl_rename() to rename a control 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@vger.kernel.org Signed-off-by: Maciej S. Szmigiero Link: https://lore.kernel.org/r/723877882e3a56bb42a2a2214cfc85f347d36e19.1666296963.git.maciej.szmigiero@oracle.com Signed-off-by: Takashi Iwai --- diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index a564195..9105ec6 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)