From: Maciej S. Szmigiero Date: Thu, 20 Oct 2022 20:46:25 +0000 (+0200) Subject: ALSA: ca0106: Use snd_ctl_rename() to rename a control X-Git-Tag: v6.0.7~226 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58a6b4af5e0864e2c3929cedc81b0a7ffdaede5d;p=thirdparty%2Fkernel%2Fstable.git ALSA: ca0106: Use snd_ctl_rename() to rename a control commit 957ccc434c398a88a332ae92d70790c186a18a1c 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@vger.kernel.org Signed-off-by: Maciej S. Szmigiero Link: https://lore.kernel.org/r/bffee980a420f9b0eee5681d2f48d34a70cec0ce.1666296963.git.maciej.szmigiero@oracle.com Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index 05f56015ddd87..f6381c098d4f6 100644 --- a/sound/pci/ca0106/ca0106_mixer.c +++ b/sound/pci/ca0106/ca0106_mixer.c @@ -720,7 +720,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;