summaryrefslogtreecommitdiff
path: root/sound/usb/mixer_us16x08.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-02-15 11:06:39 +0300
committerTakashi Iwai <tiwai@suse.de>2021-02-15 11:07:01 +0300
commitde1528ee7cb7c161444dadbc971d050bebb5cbe7 (patch)
treea1f53cd279966802de097c0f0f6625b49e6903f1 /sound/usb/mixer_us16x08.c
parent0d3070f5e6551d8a759619e85736e49a3bf40398 (diff)
parent15447b64789d9ade71eb374d5ae1f37d0bbce0bd (diff)
downloadlinux-de1528ee7cb7c161444dadbc971d050bebb5cbe7.tar.xz
Merge branch 'for-next' into for-linus
Unification of 5.12-devel branches. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer_us16x08.c')
-rw-r--r--sound/usb/mixer_us16x08.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/mixer_us16x08.c b/sound/usb/mixer_us16x08.c
index bd63a9ce6a70..b7b6f3834ed5 100644
--- a/sound/usb/mixer_us16x08.c
+++ b/sound/usb/mixer_us16x08.c
@@ -1076,7 +1076,7 @@ static int add_new_ctl(struct usb_mixer_interface *mixer,
else
kctl->private_free = snd_usb_mixer_elem_free;
- strlcpy(kctl->id.name, name, sizeof(kctl->id.name));
+ strscpy(kctl->id.name, name, sizeof(kctl->id.name));
err = snd_usb_mixer_add_control(&elem->head, kctl);
if (err < 0)